Revision 3:cbc4dfb99382

View differences:

pom.xml
486 486
		</dependency>
487 487
		<dependency>
488 488
			<groupId>net.penril</groupId>
489
			<artifactId>agro-core</artifactId>
490
			<version>0.30-SNAPSHOT</version>
489
			<artifactId>m2u-upass-admin-core</artifactId>
490
			<version>2.0-SNAPSHOT</version>
491 491
		</dependency>
492 492
	</dependencies>
493 493
</project>
resource/UPassClient.cfg
5 5
SERVICE=WS_UPassService
6 6
#WSDL=http://10.6.6.20:9081/agro_upass_ws/services/WS_UPass?wsdl
7 7
#WSDL=http://10.6.6.20:9081/agro_upass_ws.phase2/services/WS_UPass?wsdl
8
#WSDL=http://localhost:8080/agro-upass-ws/services/WS_UPass?wsdl
9
WSDL=http://10.6.6.20:9081/WSUpass.sha256/services/WS_UPass?wsdl
8
WSDL=http://localhost:8080/m2u-upass-ws/services/WS_UPass?wsdl
9
#WSDL=http://10.6.6.20:9081/WSUpass.sha256/services/WS_UPass?wsdl
10 10
#
11 11
# location of https SSL key store and password
12 12
#
resource/com/ib/hibernate/configuration/hibernate.cfg.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
2
<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
3 3
                                         "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
4 4
<hibernate-configuration>
5 5
	<session-factory>
6 6
		<!-- Database connection settings -->
7
		
8 7
		<property name="connection.driver_class">com.microsoft.sqlserver.jdbc.SQLServerDriver</property>
9
		<property name="connection.url">jdbc:sqlserver://10.6.6.21:1433;databaseName=agroib_db</property>
8
		<property name="connection.url">jdbc:sqlserver://demosvr1.penril.net:1433;databaseName=agroib_db-phase2</property>
10 9
		<property name="connection.username">agroib_user</property>
11 10
		<property name="connection.password">P@$$w0rd</property>
12
		<property name="dialect">org.hibernate.dialect.SQLServerDialect</property> 
13

  
14
		<!-- 
15
		<property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
16
		<property name="hibernate.connection.url">jdbc:oracle:thin:@219.95.244.227:1521:IBSDEMO</property>
17
		<property name="hibernate.connection.username">agroib</property>
18
		<property name="hibernate.connection.password">password</property>
19
		<property name="dialect">org.hibernate.dialect.Oracle10gDialect</property>
20
		-->
21

  
11
		<property name="dialect">org.hibernate.dialect.SQLServerDialect</property>
12
						
13
		<!-- Use the C3P0 connection pool provider -->
14
		<property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property>
15
		<property name="hibernate.c3p0.acquire_increment">1</property>
16
		<property name="hibernate.c3p0.min_size">0</property>
17
		<property name="hibernate.c3p0.max_size">500</property>
18
		<property name="hibernate.c3p0.timeout">0</property>
19
		<property name="hibernate.c3p0.max_statements">0</property>
20
		
22 21
		<!-- Enable Hibernate's automatic session context management -->
23 22
		<property name="current_session_context_class">thread</property>
24 23
		<!-- Disable the second-level cache -->
......
141 140
		<mapping resource="net/penril/bib/BIBUserActivity.hbm.xml" />
142 141
		<mapping resource="net/penril/bib/BibBulkDirectHistory.hbm.xml" />
143 142
  		<mapping resource="net/penril/bib/BibBulkPayrollHistory.hbm.xml" />
144
  		
143
		
145 144
  		<mapping resource="net/penril/ibss/core/hibernate/IbTierCharges.hbm.xml"/>
146 145
  		<mapping resource="net/penril/ibss/core/hibernate/IbTierChargesLVL.hbm.xml"/>
147 146
  		<mapping resource="net/penril/ibss/core/hibernate/MkTrnxMaster.hbm.xml"/>
src/com/ib/ibss/enterprise/services/ss105_content/ContentSharedServices.java
493 493
		service.setTacRequired(tacRequired);
494 494
		service.setSmsServiceBit(smsServiceBit);
495 495
		service.setSmsCharges(DataValidator.isEmptyString(smsCharges) ? "0" : smsCharges);
496
		service.setMinimumSmsAmount(String.valueOf(
497
				DataValidator.isEmptyString(minSmsAmount) ? "0" : minSmsAmount));
496
		service.setMinimumSmsAmount(
497
				DataValidator.isEmptyString(minSmsAmount) ? 0 : Long.parseLong(minSmsAmount));
498 498
		service.setSmsNote5(smsNote5);
499 499
		service.setTableLimit(
500 500
				DataValidator.isEmptyString(tableLimit) ? 0 : Long.parseLong(tableLimit));
501 501
		service.setBeneSmsServiceBit(beneSmsServiceBit);
502
		service.setBeneSmsCharges(String.valueOf(
503
				DataValidator.isEmptyString(beneSmsCharges) ? "0" : beneSmsCharges));
502
		service.setBeneSmsCharges(
503
				DataValidator.isEmptyString(beneSmsCharges) ? 0 : Long.parseLong(beneSmsCharges));
504 504

  
505 505
		service.setChargeCode1(chargeCode1);
506 506
		service.setChargeCode2(chargeCode2);
src/com/ib/ibss/upass/service/UPassService.java
45 45
	
46 46
	int resetTAC (String userAlias) throws Exception;
47 47
	
48
	String generateSMSPin (String userAlias) throws Exception;
48
//	String generateSMSPin (String userAlias) throws Exception;
49 49
	
50 50
	int deleteUser(String p_sUserAlias) throws Exception;
51 51
	
src/com/ib/ibss/upass/service/UPassServiceImpl.java
233 233
		return c_oClientService.UA_ActivateUser (adminUserAlias, adminUserPassword, userAlias);
234 234
	}
235 235

  
236
	@Override
237
	public String generateSMSPin(String userAlias) throws Exception {
238
		// TODO Auto-generated method stub
239
		//set Ibam AppId to 1 
240
		int appId = 3;
241
		return c_oClientService.GenerateTAC(userAlias, appId);
242
	}
236
//	@Override
237
//	public String generateSMSPin(String userAlias) throws Exception {
238
//		// TODO Auto-generated method stub
239
//		//set Ibam AppId to 1 
240
//		int appId = 3;
241
//		return c_oClientService.GenerateTAC(userAlias, appId);
242
//	}
243 243
	
244 244
	
245 245
	public String getTokenVendorName() throws Exception {
src/com/ib/ibss/upass/service/UPassServiceMockUpImpl.java
184 184
		return 0;
185 185
	}
186 186

  
187
	/**
188
	 * <Method description>
189
	 *
190
	 * @param userAlias
191
	 * @return
192
	 * @throws Exception
193
	 *
194
	 * @see com.ib.ibss.upass.service.UPassService#generateSMSPin(java.lang.String)
195
	 */
196
	@Override
197
	public String generateSMSPin (String userAlias) throws Exception
198
	{
199
		// TODO Auto-generated method stub
200
		return "123456";
201
	}
187
//	/**
188
//	 * <Method description>
189
//	 *
190
//	 * @param userAlias
191
//	 * @return
192
//	 * @throws Exception
193
//	 *
194
//	 * @see com.ib.ibss.upass.service.UPassService#generateSMSPin(java.lang.String)
195
//	 */
196
//	@Override
197
//	public String generateSMSPin (String userAlias) throws Exception
198
//	{
199
//		// TODO Auto-generated method stub
200
//		return "123456";
201
//	}
202 202

  
203 203
	@Override
204 204
	public int deleteUser(String p_sUserAlias) throws Exception {

Also available in: Unified diff