Merging Rachel's Changes

src/main/resources/csp.default.properties

@@ -4,24 +4,29 @@ csp.inviteMapLocation=/tmp/inviteMap.txt
 
 # Default CSP Properties ( uses +testcsp )
 csp.cloudNumber=[+]!:uuid:20e3d77c-5a0e-44d5-b949-85153fbb6577
+#csp.cloudNumber=[+]!:uuid:a556aa6d-035c-4fd7-89d2-818815608982
 csp.rnCspLinkContract=[+]!:uuid:ca51aeb9-e09e-4305-89d7-87a944a1e1fa$to#registrar$from$do
-csp.cspSecretToken=XXXXX
+csp.cspSecretToken=whitelabel123
+#csp.cspSecretToken=ud17v8z8D3SO
 csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-registry
 csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-users/
-csp.rnRegistrationServiceXdiEndpoint=http://registration-dev.respectnetwork.net/registration
+#csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-registry
+#csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-users/
+#csp.rnRegistrationServiceXdiEndpoint=http://registration-dev.respectnetwork.net/registration
+csp.rnRegistrationServiceXdiEndpoint=https://registration-stage.respectnetwork.net/registration
 csp.rnCspSecretToken=
 csp.cspDiscoveryClientURL=https://xdidiscoveryserviceote.xdi.net
 csp.contactPhone=123-456-7890
 [email protected]
-csp.cspRespectConnectBaseURL=https://respectconnectote.neustar.biz/
+csp.cspRespectConnectBaseURL=http://www.example.com/
 csp.cspTCURL=http://www.onexus.com/terms.html
-csp.nameAvailabilityCheckURL=https://registration-stage.respectnetwork.net/rn-checkavailability-service/
 
 # CSP Invite Properties
 csp.cspName=testcsp
-csp.cspCloudName=+paoga
-csp.cspDisplayName=Test CSP
-csp.cspInviteURL=http://localhost:8080/testcsp
+csp.cspCloudName=+testcsp
+#csp.cspCloudName=+testcsp
+csp.cspDisplayName=TestCsp
+csp.cspInviteURL=http://s3.amazonaws.com/equalsandy/tests/RNEnd.html
 csp.cspHomeURL=/testcsp
 csp.cspInviteCode=QWE234SDFSDF
 csp.cspRegURL=http://localhost:8080/testcsp
@@ -39,5 +44,5 @@ csp.validateCodes=false
 # More config parameters
 csp.refererURL=localhost
 
-
+csp.nameAvailabilityCheckURL=https://registration-stage.respectnetwork.net/rn-checkavailability-service/
 

src/main/resources/csp.dev.properties

@@ -3,15 +3,15 @@ csp.rnCloudNumber=[+]!:uuid:ca51aeb9-e09e-4305-89d7-87a944a1e1fa
 csp.inviteMapLocation=/tmp/inviteMap.txt
 
 # Default CSP Properties ( uses +testcsp )
-#csp.cloudNumber=[+]!:uuid:20e3d77c-5a0e-44d5-b949-85153fbb6577
-csp.cloudNumber=[+]!:uuid:a556aa6d-035c-4fd7-89d2-818815608982
+csp.cloudNumber=[+]!:uuid:20e3d77c-5a0e-44d5-b949-85153fbb6577
+#csp.cloudNumber=[+]!:uuid:a556aa6d-035c-4fd7-89d2-818815608982
 csp.rnCspLinkContract=[+]!:uuid:ca51aeb9-e09e-4305-89d7-87a944a1e1fa$to#registrar$from$do
-#csp.cspSecretToken=whitelabel123
-csp.cspSecretToken=ud17v8z8D3SO
-#csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-registry
-#csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-users/
-csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-registry
-csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-users/
+csp.cspSecretToken=whitelabel123
+#csp.cspSecretToken=ud17v8z8D3SO
+csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-registry
+csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/testcsp-users/
+#csp.cspRegistryXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-registry
+#csp.cspCloudBaseXdiEndpoint=https://mycloud-ote.neustar.biz/paoga-users/
 #csp.rnRegistrationServiceXdiEndpoint=http://registration-dev.respectnetwork.net/registration
 csp.rnRegistrationServiceXdiEndpoint=https://registration-stage.respectnetwork.net/registration
 csp.rnCspSecretToken=
@@ -22,12 +22,12 @@ csp.cspRespectConnectBaseURL=http://www.example.com/
 csp.cspTCURL=http://www.onexus.com/terms.html
 
 # CSP Invite Properties
-csp.cspName=paoga
-csp.cspCloudName=+paoga
+csp.cspName=testcsp
+csp.cspCloudName=+testcsp
 #csp.cspCloudName=+testcsp
-csp.cspDisplayName=PAOGA
+csp.cspDisplayName=TestCsp
 csp.cspInviteURL=http://s3.amazonaws.com/equalsandy/tests/RNEnd.html
-csp.cspHomeURL=/paoga
+csp.cspHomeURL=/testcsp
 csp.cspInviteCode=QWE234SDFSDF
 csp.cspRegURL=http://localhost:8080/testcsp
 csp.requireInviteCode=false
@@ -44,5 +44,5 @@ csp.validateCodes=false
 # More config parameters
 csp.refererURL=localhost
 
-
+csp.nameAvailabilityCheckURL=https://registration-stage.respectnetwork.net/rn-checkavailability-service/
 

src/main/resources/db.dev.properties

@@ -1,6 +1,6 @@
 db.driver=com.mysql.jdbc.Driver
-db.jdbcUrl=jdbc:mysql://strecdvvap24:3306/csp_prov?autoReconnect=true
-db.username=csp_prov_app
-db.password=csp_prov_app
+db.jdbcUrl=jdbc:mysql://localhost:8889/csp_prov?autoReconnect=true
+db.username=app_user
+db.password=password
 db.minPoolSize=3
 db.maxPoolSize=20

src/main/webapp copy/WEB-INF/spring/CSPApp/i18n.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:beans="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
+
+    <!-- Internationalization support -->
+
+    <beans:bean id="localeResolver"
+        class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
+        <beans:property name="defaultLocale" value="en_US" />
+    </beans:bean>
+
+    <beans:bean id="localeChangeInterceptor"
+        class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
+        <beans:property name="paramName" value="language" />
+    </beans:bean>
+
+    <beans:bean class="org.springframework.web.servlet.mvc.support.ControllerClassNameHandlerMapping" >
+        <beans:property name="interceptors">
+           <beans:list>
+            <beans:ref bean="localeChangeInterceptor" />
+           </beans:list>
+        </beans:property>
+    </beans:bean>
+
+    <beans:bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+        <beans:property name="basename" value="locale/messages" />
+    </beans:bean>
+
+
+</beans:beans>

src/main/webapp copy/WEB-INF/spring/CSPApp/invitation.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
+
+
+    <!-- MockInviter Service -->  
+    <beans:bean id="mockInviter"
+        class="net.respectnetwork.csp.application.invite.MockInviterService" > 
+        <beans:constructor-arg name="inviteFileName" value="${csp.inviteMapLocation}"/>  
+    </beans:bean>
+
+
+    <!-- MockInviter Service -->  
+    <beans:bean id="invitationManager"
+        class="net.respectnetwork.csp.application.invite.InvitationManager" >
+        <beans:property name="invitationService" ref="mockInviter"/>
+        <beans:property name="cspStore" ref="cspStore"/>
+     </beans:bean>
+
+
+    <beans:bean id="cspStore" class="net.respectnetwork.csp.application.csp.CSPMapStore">
+        <beans:property name="cspMap">
+            <beans:map>
+                 <beans:entry key ="respectnetwork" value-ref="rnCSP"/>
+                 <beans:entry key ="${csp.cspName}" value-ref="myCSP"/>
+            </beans:map>
+        </beans:property>
+    </beans:bean>
+
+    <beans:bean id="rnCSP" class="net.respectnetwork.csp.application.csp.CSP">
+        <beans:property name="identifier" value="respectnetwork"/>
+        <beans:property name="displayName" value="RespectNetwork"/>
+        <beans:property name="inviteURL" value="http://localhost:8080/rn-consumer-application"/>
+        <beans:property name="homeURL" value="/"/>
+        <beans:property name="inviteCode" value="HNlamN0iTl64x5NpBTJSA"/>
+        <beans:property name="regURL" value="http://localhost:8080/csp-provisioning-application"/>
+    </beans:bean>
+
+    <beans:bean id="myCSP" class="net.respectnetwork.csp.application.csp.CSP">
+        <beans:property name="identifier" value="${csp.cspName}"/>
+        <beans:property name="displayName" value="${csp.cspDisplayName}"/>
+        <beans:property name="inviteURL" value="${csp.cspInviteURL}"/>
+        <beans:property name="homeURL" value="${csp.cspHomeURL}"/>
+        <beans:property name="inviteCode" value="${csp.cspInviteCode}"/>
+        <beans:property name="regURL" value="${csp.cspRegURL}"/>
+    </beans:bean>
+
+</beans:beans>

src/main/webapp copy/WEB-INF/spring/CSPApp/notification.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
+    <beans:bean id="basicUserValidator" class="net.respectnetwork.sdk.csp.BasicUserValidator">
+        <beans:property name="theNotifier" ref="basicNotifier"/>
+        <beans:property name="tokenManager" ref="basicTokenManager"/>  
+        <beans:property name="validationEndpoint" value="http://localhost:8080/csp-provisioning-application/enterValidationCodes"/>
+        <beans:property name="messageManager" ref="basicMessageManager"/>
+    </beans:bean>
+
+    <!-- Notifier  -->     
+   <!-- <beans:bean id="basicNotifier" class="net.respectnetwork.sdk.csp.notification.BasicOCENotificationService"> -->
+ 	<beans:bean id="basicNotifier" class="net.respectnetwork.sdk.csp.notification.BasicNotificationService">   
+        <!-- Twilio Properties -->
+        <beans:property name="authToken" value="${twilio.authToken}"/>
+        <beans:property name="twillioAccountSID" value="${twilio.accountSID}"/>
+        <beans:property name="cspSMSNumber" value="${twilio.cspSMSNumber}"/>      
+
+        <!--  Email Properties -->
+        <beans:property name="emailSubject" value="${mail.subject}"/>
+        <beans:property name="emailFrom" value="${mail.from}"/>
+        <beans:property name="mailAccountUsername" value="${mail.username}"/>
+        <beans:property name="mailAccountPassword" value="${mail.password}"/>
+
+        <beans:property name="mailSMTPAuth" value="${mail.smtp.auth}"/>
+        <beans:property name="mailStartTLS" value="${mail.smtp.starttls.enable}"/>
+        <beans:property name="mailSMTPHost" value="${mail.smtp.host}"/>
+        <beans:property name="mailSMTPPort" value="${mail.smtp.port}"/>
+        <beans:property name="mailTransport" value="${mail.transport.protocol}"/>
+
+        <beans:property name="mailDebug" value="${mail.debug}"/>
+
+        <!--  OCE mailer properties -->
+ 		<!--       
+        <beans:property name="OCEApiKey" value="${oce.apikey}"/>
+        <beans:property name="OCESecret" value="${oce.secret}"/>
+        <beans:property name="OCEendpoint" value="${oce.endpoint}"/>
+        -->
+    </beans:bean>
+
+    <!-- Token Manager -->
+    <beans:bean id="basicTokenManager" class="net.respectnetwork.sdk.csp.notification.AnotherBasicTokenManager">
+
+    </beans:bean>
+
+    <!-- Message Manager -->
+    <beans:bean id="basicMessageManager" class="net.respectnetwork.sdk.csp.notification.BasicMessageManager">
+        <beans:property name="emailTemplate" value="${email.template}"/>
+        <beans:property name="smsTemplate" value="${sms.template}"/>
+    </beans:bean>
+
+</beans:beans>

src/main/webapp copy/WEB-INF/spring/CSPApp/payment.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
+    <beans:bean id="nopPaymentProcessor"
+        class="net.respectnetwork.sdk.csp.payment.NOPPaymentProcessor" />
+
+    <beans:bean id="registrationAmount" class="java.lang.String">
+        <beans:constructor-arg value="${csp.regAmount}" />
+    </beans:bean>
+
+    <beans:bean id="registrationCurrencyCode" class="java.lang.String">
+        <beans:constructor-arg value="${csp.regCurrency}" />
+    </beans:bean>
+
+</beans:beans>

src/main/webapp copy/WEB-INF/spring/CSPApp/resources.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:beans="http://www.springframework.org/schema/beans"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:aop="http://www.springframework.org/schema/aop"
+    xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
+
+
+    <!-- Handles HTTP GET requests for /resources/** by efficiently serving 
+        up static resources in the ${webappRoot}/resources directory -->
+    <resources mapping="/css/**" location="/css/" />
+    <resources mapping="/js/libs/**" location="/js/libs/" />
+    <resources mapping="/img/**" location="/img/" />
+
+
+
+</beans:beans>