juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1481240 [4/4] - in /juddi/branches/juddi-3.2.x: ./ juddi-client/ juddi-client/src/main/java/org/apache/juddi/v3/client/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/main/java/org/apache/juddi/v3/client/map...
Date Sat, 11 May 2013 00:27:35 GMT
Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties Sat May 11 00:27:33 2013
@@ -26,47 +26,47 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
-file.reference.aopalliance-1.0.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\aopalliance-1.0.jar
-file.reference.asm-3.3.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\asm-3.3.jar
-file.reference.commons-beanutils-1.7.0.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-beanutils-1.7.0.jar
-file.reference.commons-beanutils-core-1.8.0.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-beanutils-core-1.8.0.jar
-file.reference.commons-codec-1.3.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-codec-1.3.jar
-file.reference.commons-collections-3.2.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-collections-3.2.1.jar
-file.reference.commons-configuration-1.6.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-configuration-1.6.jar
-file.reference.commons-digester-1.8.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-digester-1.8.jar
-file.reference.commons-lang-2.4.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-lang-2.4.jar
+file.reference.aopalliance-1.0.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/aopalliance-1.0.jar
+file.reference.asm-3.3.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/asm-3.3.jar
+file.reference.commons-beanutils-1.7.0.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-beanutils-1.7.0.jar
+file.reference.commons-beanutils-core-1.8.0.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-beanutils-core-1.8.0.jar
+file.reference.commons-codec-1.3.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-codec-1.3.jar
+file.reference.commons-collections-3.2.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-collections-3.2.1.jar
+file.reference.commons-configuration-1.6.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-configuration-1.6.jar
+file.reference.commons-digester-1.8.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-digester-1.8.jar
+file.reference.commons-lang-2.4.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-lang-2.4.jar
 file.reference.commons-logging-api-1.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/commons-logging-api-1.1.jar
-file.reference.cxf-api-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-api-2.3.1.jar
-file.reference.cxf-common-schemas-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-common-schemas-2.3.1.jar
-file.reference.cxf-common-utilities-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-common-utilities-2.3.1.jar
-file.reference.cxf-rt-bindings-soap-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-bindings-soap-2.3.1.jar
-file.reference.cxf-rt-bindings-xml-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-bindings-xml-2.3.1.jar
-file.reference.cxf-rt-core-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-core-2.3.1.jar
-file.reference.cxf-rt-databinding-jaxb-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-databinding-jaxb-2.3.1.jar
-file.reference.cxf-rt-frontend-jaxws-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-frontend-jaxws-2.3.1.jar
-file.reference.cxf-rt-frontend-simple-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-frontend-simple-2.3.1.jar
-file.reference.cxf-rt-transports-http-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-transports-http-2.3.1.jar
-file.reference.cxf-rt-ws-addr-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-ws-addr-2.3.1.jar
-file.reference.cxf-tools-common-2.3.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-tools-common-2.3.1.jar
-file.reference.geronimo-javamail_1.4_spec-1.7.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-javamail_1.4_spec-1.7.1.jar
-file.reference.jaxb-impl-2.1.13.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\jaxb-impl-2.1.13.jar
+file.reference.cxf-api-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-api-2.3.1.jar
+file.reference.cxf-common-schemas-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-common-schemas-2.3.1.jar
+file.reference.cxf-common-utilities-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-common-utilities-2.3.1.jar
+file.reference.cxf-rt-bindings-soap-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-bindings-soap-2.3.1.jar
+file.reference.cxf-rt-bindings-xml-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-bindings-xml-2.3.1.jar
+file.reference.cxf-rt-core-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-core-2.3.1.jar
+file.reference.cxf-rt-databinding-jaxb-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-databinding-jaxb-2.3.1.jar
+file.reference.cxf-rt-frontend-jaxws-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-frontend-jaxws-2.3.1.jar
+file.reference.cxf-rt-frontend-simple-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-frontend-simple-2.3.1.jar
+file.reference.cxf-rt-transports-http-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-transports-http-2.3.1.jar
+file.reference.cxf-rt-ws-addr-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-rt-ws-addr-2.3.1.jar
+file.reference.cxf-tools-common-2.3.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/cxf-tools-common-2.3.1.jar
+file.reference.geronimo-javamail_1.4_spec-1.7.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/geronimo-javamail_1.4_spec-1.7.1.jar
+file.reference.jaxb-impl-2.1.13.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/jaxb-impl-2.1.13.jar
 file.reference.juddi-client-3.1.5-SNAPSHOT.jar=../juddi-client/target/juddi-client-3.1.5-SNAPSHOT.jar
-file.reference.neethi-2.0.4.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\neethi-2.0.4.jar
-file.reference.persistence-api-1.0.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\persistence-api-1.0.jar
-file.reference.serp-1.13.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\serp-1.13.1.jar
-file.reference.spring-aop-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-aop-3.0.5.RELEASE.jar
-file.reference.spring-asm-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-asm-3.0.5.RELEASE.jar
-file.reference.spring-beans-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-beans-3.0.5.RELEASE.jar
-file.reference.spring-context-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-context-3.0.5.RELEASE.jar
-file.reference.spring-core-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-core-3.0.5.RELEASE.jar
-file.reference.spring-expression-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-expression-3.0.5.RELEASE.jar
-file.reference.spring-web-3.0.5.RELEASE.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-web-3.0.5.RELEASE.jar
-file.reference.stax2-api-3.0.2.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\stax2-api-3.0.2.jar
-file.reference.uddi-ws-3.1.5-SNAPSHOT.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\uddi-ws-3.1.5-SNAPSHOT.jar
-file.reference.woodstox-core-asl-4.0.8.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\woodstox-core-asl-4.0.8.jar
-file.reference.wsdl4j-1.6.2.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\wsdl4j-1.6.2.jar
-file.reference.xml-resolver-1.2.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\xml-resolver-1.2.jar
-file.reference.XmlSchema-1.4.7.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\XmlSchema-1.4.7.jar
+file.reference.neethi-2.0.4.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/neethi-2.0.4.jar
+file.reference.persistence-api-1.0.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/persistence-api-1.0.jar
+file.reference.serp-1.13.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/serp-1.13.1.jar
+file.reference.spring-aop-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-aop-3.0.5.RELEASE.jar
+file.reference.spring-asm-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-asm-3.0.5.RELEASE.jar
+file.reference.spring-beans-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-beans-3.0.5.RELEASE.jar
+file.reference.spring-context-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-context-3.0.5.RELEASE.jar
+file.reference.spring-core-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-core-3.0.5.RELEASE.jar
+file.reference.spring-expression-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-expression-3.0.5.RELEASE.jar
+file.reference.spring-web-3.0.5.RELEASE.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/spring-web-3.0.5.RELEASE.jar
+file.reference.stax2-api-3.0.2.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/stax2-api-3.0.2.jar
+file.reference.uddi-ws-3.1.5-SNAPSHOT.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/uddi-ws-3.1.5-SNAPSHOT.jar
+file.reference.woodstox-core-asl-4.0.8.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/woodstox-core-asl-4.0.8.jar
+file.reference.wsdl4j-1.6.2.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/wsdl4j-1.6.2.jar
+file.reference.xml-resolver-1.2.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/xml-resolver-1.2.jar
+file.reference.XmlSchema-1.4.7.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/XmlSchema-1.4.7.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -159,6 +159,6 @@ src.dir=${source.root}/java
 test.src.dir=test
 war.content.additional=
 war.ear.name=${war.name}
-war.name=UDDIBrowser.war
+war.name=juddi-gui.war
 web.docbase.dir=web
 webinf.dir=web/WEB-INF

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml Sat May 11 00:27:33 2013
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.web.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
-            <name>UDDIBrowser</name>
+            <name>juddi-gui</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java Sat May 11 00:27:33 2013
@@ -547,7 +547,7 @@ public class UddiHub {
      * Performs a getServiceDetails in Inquiry API
      *
      * @param serviceid
-     * @return  null if no id was specified or if it didn't exist
+     * @return null if no id was specified or if it didn't exist
      */
     public BusinessService GetServiceDetail(String serviceid) {
         if (serviceid == null || serviceid.length() == 0) {
@@ -899,6 +899,11 @@ public class UddiHub {
 
     }
 
+    /**
+     * returns a bootstrap html stylizies an error message with a warning icon
+     * @param HandleException, any string representing an error message
+     * @return 
+     */
     public static String ToErrorAlert(String HandleException) {
         return "<div class=\"alert alert-error\"><i class=\"icon-warning-sign icon-large\"></i>&nbsp;" + HandleException + "</div>";
     }
@@ -1032,6 +1037,12 @@ public class UddiHub {
             kr.setKeyName("uddi-org:keyGenerator");
             kr.setKeyValue("keyGenerator");
             tm.getCategoryBag().getKeyedReference().add(kr);
+            OverviewDoc overviewDoc = new OverviewDoc();
+            OverviewURL overviewUrl = new OverviewURL();
+            overviewUrl.setUseType("text");
+            overviewUrl.setValue("http://uddi.org/pubs/uddi_v3.htm#keyGen");
+            overviewDoc.setOverviewURL(overviewUrl);
+            tm.getOverviewDoc().add(overviewDoc);
             tm.setTModelKey(partitionName.toLowerCase());
             st.getTModel().add(tm);
             publish.saveTModel(st);
@@ -2274,8 +2285,9 @@ public class UddiHub {
      * @return
      */
     public RegisteredInfo GetNodeInformation(AtomicReference<String> outmsg) {
-        if (outmsg==null)
+        if (outmsg == null) {
             outmsg = new AtomicReference<String>();
+        }
         try {
             GetRegisteredInfo r = new GetRegisteredInfo();
             r.setAuthInfo(GetToken());
@@ -2325,10 +2337,9 @@ public class UddiHub {
     public List<AssertionStatusItem> GetPublisherAssertions(AtomicReference<String> msg) {
         List<AssertionStatusItem> out = new ArrayList<AssertionStatusItem>();
 
-        if (GetToken()==null)
-        {
-            msg.set( ResourceLoader.GetResource(session, "errors.notsignedin"));
-           return null;
+        if (GetToken() == null) {
+            msg.set(ResourceLoader.GetResource(session, "errors.notsignedin"));
+            return null;
         }
         List<AssertionStatusItem> STATUS_COMPLETE = null;
 
@@ -2498,8 +2509,7 @@ public class UddiHub {
      * @throws DatatypeConfigurationException
      */
     public String GetNewsFeed(XMLGregorianCalendar lastRefresh) throws DatatypeConfigurationException {
-        if (GetToken()==null)
-        {
+        if (GetToken() == null) {
             return ToErrorAlert(ResourceLoader.GetResource(session, "errors.notsignedin"));
         }
         if (df == null) {

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Sat May 11 00:27:33 2013
@@ -327,3 +327,5 @@ pages.transfer.accepttransfer.content=If
 actions.savethis=Copy and save this information to your computer. There's no way to retrieve this information again! 
 navbar.help.source=Source Code
 actions.approve=Approve
+navbar.create.serviceimport=Register Services from WSDL
+navbar.create.serviceimport.tooltip=Based on the UDDI TC, Using WSDL in a UDDI Registry

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Sat May 11 00:27:33 2013
@@ -328,3 +328,5 @@ pages.transfer.accepttransfer.content=Si
 actions.savethis=Copie y guarde esta informaci\u00f3n a su ordenador. No hay manera de recuperar esta informaci\u00f3n de nuevo!
 navbar.help.source=C\u00f3digo Fuente
 actions.approve=Aprobar
+navbar.create.serviceimport=Registro de Servicios de WSDL
+navbar.create.serviceimport.tooltip=Basado en el UDDI TC, utilizando WSDL en un registro UDDI

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/context.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/context.xml?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/context.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/context.xml Sat May 11 00:27:33 2013
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/UDDIBrowser"/>
+<Context antiJARLocking="true" path="/juddi-gui"/>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Sat May 11 00:27:33 2013
@@ -140,6 +140,7 @@
                                     <ul class="dropdown-menu">
                                         <li><a href="businessEditor2.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.business.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.business")%></a></li>
                                         <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.service")%></a></li>
+                                        <li><a href="importFromWsdl.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.serviceimport.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.serviceimport")%></a></li>
                                         <li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodel")%></a></li>
                                         <li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen")%></a></li>
                                     </ul>

Modified: juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-tomcat/build.xml Sat May 11 00:27:33 2013
@@ -3,6 +3,7 @@
 	<property name="lib.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/lib"/>
 	<property name="webapps.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps"/>
 	<property name="conf.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/conf"/>
+	<property name="endorsed.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/endorsed"/>
 
 	<target name="unzip-tomcat">
 		<mkdir dir="${basedir}/target/tomcat"/>
@@ -13,29 +14,13 @@
 	<target name="copy-resources" depends="unzip-tomcat">
 		<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
 		<copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/>
-		<!--
-		<copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3-samples/META-INF"/>
-		-->
 		<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>
  		<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.derby.jar}" todir="${lib.dir}"/>
 		<copy file="${dependency.commons-discovery.jar}" todir="${lib.dir}"/>
-		<!--
-		<replace file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
-			<replacetoken>juddi-sql/mysql</replacetoken>
-			<replacevalue>juddi-sql/derby</replacevalue>
-		</replace>
-		<replace file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
-			<replacetoken>#juddi.jdbcUrl=jdbc:mysql://localhost/juddi</replacetoken>
-			<replacevalue>juddi.jdbcUrl=jdbc:derby:juddi-derby-test-db;create=true</replacevalue>
-		</replace>
-	        <replace file="${webapps.dir}/juddiv3/WEB-INF/juddiv3.properties">
-                        <replacetoken>#juddi.jdbcDriver=com.mysql.jdbc.Driver</replacetoken>
-                        <replacevalue>juddi.jdbcDriver=org.apache.derby.jdbc.EmbeddedDriver</replacevalue>
-                </replace>	
-		-->
+		<copy file="${dependency.jaxws.jar}" todir="${endorsed.dir}"/>
 	</target>
 	
 	<target name="package-tomcat" depends="copy-resources">

Modified: juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml Sat May 11 00:27:33 2013
@@ -54,6 +54,12 @@
 			<version>5.1.6</version>
 		</dependency>
 		<dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+          <version>1.0</version>
+          <type>jar</type>
+        </dependency>
+		<dependency>
             <groupId>postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>8.2-504.jdbc3</version>
@@ -94,6 +100,7 @@
 								<property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}" />
 								<property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
 								<property name="dependency.juddiv3.war" value="${basedir}/../juddiv3-war/target/juddiv3.war" />
+								<property name="dependency.jaxws.jar" value="${maven.dependency.org.apache.geronimo.specs.geronimo-jaxws_2.2_spec.jar.path}" />
 								<ant antfile="${basedir}/build.xml">
 									<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
 									<target name="package-tomcat" />

Modified: juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml Sat May 11 00:27:33 2013
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!-- * Copyright 2001-2009 The Apache Software Foundation. * * Licensed under 
+	the Apache License, Version 2.0 (the "License"); * you may not use this file 
+	except in compliance with the License. * You may obtain a copy of the License 
+	at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by 
+	applicable law or agreed to in writing, software * distributed under the 
+	License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. * See the License for the specific 
+	language governing permissions and * limitations under the License. * */ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.juddi</groupId>
@@ -57,225 +50,319 @@
 		<finalName>juddiv3</finalName>
 	</build>
 	<profiles>
-	    <!-- the hibernate-jbossws-native profile builds a war for jboss, where hibernate
-	    and jbossws are provided by the appserver -->
+		<!-- the hibernate-jbossws-native profile builds a war for jboss, where 
+			hibernate and jbossws are provided by the appserver -->
 		<profile>
 			<id>hibernate-jbossws-native</id>
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<build>
-		    <plugins>
-		      <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-war-plugin</artifactId>
-		        <configuration>
-		          <webResources>
-		            <resource>
-		              <directory>JPA/Hibernate-JBoss</directory>
-		            </resource>
-		            <resource>
-                      <directory>JAX-WS/JBossWS-Native</directory>
-                    </resource>
-		          </webResources>
-		        </configuration>
-		      </plugin>
-		    </plugins>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webResources>
+								<resource>
+									<directory>JPA/Hibernate-JBoss</directory>
+								</resource>
+								<resource>
+									<directory>JAX-WS/JBossWS-Native</directory>
+								</resource>
+							</webResources>
+						</configuration>
+					</plugin>
+				</plugins>
 			</build>
 			<dependencies>
-			 <dependency>
-	            <artifactId>juddi-core</artifactId>
-	            <groupId>org.apache.juddi</groupId>
-	            <version>3.1.5-SNAPSHOT</version>
-	         </dependency>
-	         <dependency>
-                    <groupId>javax.persistence</groupId>
-                    <artifactId>persistence-api</artifactId>
-                    <version>1.0</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate</artifactId>
-                    <version>3.2.5.ga</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.3.1.ga</version>
-                    <scope>provided</scope>
-                </dependency>
-             
+				<dependency>
+					<artifactId>juddi-core</artifactId>
+					<groupId>org.apache.juddi</groupId>
+					<version>3.1.5-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+					<version>1.0</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate</artifactId>
+					<version>3.2.5.ga</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-entitymanager</artifactId>
+					<version>3.3.1.ga</version>
+					<scope>provided</scope>
+				</dependency>
+
 			</dependencies>
 		</profile>
-		      <profile>
-            <id>hibernate-jbossws-cxf</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                  <webResources>
-                    <resource>
-                      <directory>JPA/Hibernate-JBoss</directory>
-                    </resource>
-                    <resource>
-                      <directory>JAX-WS/JBossWS-CXF</directory>
-                    </resource>
-                  </webResources>
-                </configuration>
-              </plugin>
-            </plugins>
-            </build>
-            <dependencies>
-             <dependency>
-                <artifactId>juddi-core</artifactId>
-                <groupId>org.apache.juddi</groupId>
-                <version>3.1.5-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                    <groupId>javax.persistence</groupId>
-                    <artifactId>persistence-api</artifactId>
-                    <version>1.0</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate</artifactId>
-                    <version>3.2.5.ga</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.hibernate</groupId>
-                    <artifactId>hibernate-entitymanager</artifactId>
-                    <version>3.3.1.ga</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>cglib</groupId>
-                    <artifactId>cglib-nodep</artifactId>
-                    <version>2.1_3</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
 		<profile>
-		    <!-- the hibernate profile builds a war for tomcat, with hibernate and cxf in
-		         the war -->
-            <id>hibernate</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                  <webResources>
-                    <resource>
-                      <directory>JPA/Hibernate</directory>
-                    </resource>
-                    <resource>
-                      <directory>JAX-WS/CXF</directory>
-                    </resource>
-                  </webResources>
-                </configuration>
-              </plugin>
-            </plugins>
-            </build>
-            <dependencies>
-             <dependency>
-                <artifactId>juddi-core</artifactId>
-                <groupId>org.apache.juddi</groupId>
-                <version>3.1.5-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                    <version>${cxf.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-http</artifactId>
-                    <version>${cxf.version}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.javamail</groupId>
-                    <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                    <version>1.8.2</version>
-                </dependency>
-            </dependencies>
-        </profile>
+			<id>hibernate-jbossws-cxf</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webResources>
+								<resource>
+									<directory>JPA/Hibernate-JBoss</directory>
+								</resource>
+								<resource>
+									<directory>JAX-WS/JBossWS-CXF</directory>
+								</resource>
+							</webResources>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<artifactId>juddi-core</artifactId>
+					<groupId>org.apache.juddi</groupId>
+					<version>3.1.5-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+					<version>1.0</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate</artifactId>
+					<version>3.2.5.ga</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-entitymanager</artifactId>
+					<version>3.3.1.ga</version>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>cglib</groupId>
+					<artifactId>cglib-nodep</artifactId>
+					<version>2.1_3</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<!-- the hibernate profile builds a war for tomcat, with hibernate and 
+				cxf in the war -->
+			<id>hibernate</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webResources>
+								<resource>
+									<directory>JPA/Hibernate</directory>
+								</resource>
+								<resource>
+									<directory>JAX-WS/CXF</directory>
+								</resource>
+							</webResources>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<dependency>
+					<artifactId>juddi-core</artifactId>
+					<groupId>org.apache.juddi</groupId>
+					<version>3.1.5-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-rt-frontend-jaxws</artifactId>
+					<version>${cxf.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-rt-transports-http</artifactId>
+					<version>${cxf.version}</version>
+					<exclusions>
+						<exclusion>
+							<groupId>cglib</groupId>
+							<artifactId>cglib</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.geronimo.javamail</groupId>
+					<artifactId>geronimo-javamail_1.4_mail</artifactId>
+					<version>1.8.2</version>
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
-		  <!-- the openjpa profile builds a war for tomcat, with openjpa and cxf in
-                 the war -->
+			<!-- the openjpa profile builds a war for tomcat, with openjpa and cxf 
+				in the war -->
 			<id>openjpa</id>
 			<activation>
-			    <activeByDefault>true</activeByDefault>
+				<activeByDefault>true</activeByDefault>
 			</activation>
 			<build>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                  <webResources>
-                    <resource>
-                      <directory>JPA/OpenJPA</directory>
-                    </resource>
-                    <resource>
-                      <directory>JAX-WS/CXF</directory>
-                    </resource>
-                  </webResources>
-                </configuration>
-              </plugin>
-            </plugins>
-            </build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webResources>
+								<resource>
+									<directory>JPA/OpenJPA</directory>
+								</resource>
+								<resource>
+									<directory>JAX-WS/CXF</directory>
+								</resource>
+							</webResources>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 			<dependencies>
 				<dependency>
-	            <artifactId>juddi-core-openjpa</artifactId>
-	            <groupId>org.apache.juddi</groupId>
-	            <version>3.1.5-SNAPSHOT</version> 
-	            <exclusions>
-	                <exclusion>
-	                    <groupId>junit</groupId>
-	                    <artifactId>junit</artifactId>
-	                </exclusion>
-	            </exclusions>
-	            </dependency>
-                <dependency>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                    <version>${cxf.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.cxf</groupId>
-                    <artifactId>cxf-rt-transports-http</artifactId>
-                    <version>${cxf.version}</version>
+					<artifactId>juddi-core-openjpa</artifactId>
+					<groupId>org.apache.juddi</groupId>
+					<version>3.1.5-SNAPSHOT</version>
+					<exclusions>
+						<exclusion>
+							<groupId>junit</groupId>
+							<artifactId>junit</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-rt-frontend-jaxws</artifactId>
+					<version>${cxf.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-rt-transports-http</artifactId>
+					<version>${cxf.version}</version>
+					<exclusions>
+						<exclusion>
+							<groupId>cglib</groupId>
+							<artifactId>cglib</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.geronimo.javamail</groupId>
+					<artifactId>geronimo-javamail_1.4_mail</artifactId>
+					<version>1.8.2</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<!-- the openjpa-axis2 profile builds a war for tomcat, with openjpa and 
+				axis2 in the war -->
+			<id>axis2</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<webResources>
+								<resource>
+									<directory>JPA/OpenJPA</directory>
+								</resource>
+								<resource>
+									<directory>JAX-WS/Axis2</directory>
+								</resource>
+							</webResources>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.6</version>
+						<executions>
+							<execution>
+								<id>default-cli</id>
+								<configuration>
+									<target name="axis2-servicejars">
+										<dependencyfilesets prefix="mydeps." />
+										<mkdir dir="${basedir}/target/juddiv3/WEB-INF/servicejars" />
+										<copy todir="${basedir}/target/juddiv3/WEB-INF/servicejars">
+											<fileset refid="mydeps.org.apache.juddi:juddi-core-openjpa:jar" />
+										</copy>
+									</target>
+								</configuration>
+								<phase>compile</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+			    <!-- providing this through ant in the servicejars directory -->
+			    <dependency>
+                    <artifactId>juddi-core-openjpa</artifactId>
+                    <groupId>org.apache.juddi</groupId>
+                    <version>3.1.5-SNAPSHOT</version>
                     <exclusions>
                         <exclusion>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib</artifactId>
+                            <groupId>junit</groupId>
+                            <artifactId>junit</artifactId>
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-		            <groupId>org.apache.geronimo.javamail</groupId>
-		            <artifactId>geronimo-javamail_1.4_mail</artifactId>
-		            <version>1.8.2</version>
-		        </dependency>	            
+                <!-- and then add the axis2 jars -->
+				<dependency>
+					<groupId>org.apache.axis2</groupId>
+					<artifactId>axis2</artifactId>
+					<version>1.6.2</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.axis2</groupId>
+					<artifactId>axis2-jaxws</artifactId>
+					<version>1.6.2</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.axis2</groupId>
+					<artifactId>axis2-transport-http</artifactId>
+					<version>1.6.2</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.axis2</groupId>
+					<artifactId>axis2-transport-local</artifactId>
+					<version>1.6.2</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.xmlbeans</groupId>
+					<artifactId>xmlbeans</artifactId>
+					<version>2.4.0</version>
+				</dependency>
+				<dependency>
+					<groupId>org.apache.geronimo.javamail</groupId>
+					<artifactId>geronimo-javamail_1.4_mail</artifactId>
+					<version>1.8.2</version>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>

Modified: juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties (original)
+++ juddi/branches/juddi-3.2.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.properties Sat May 11 00:27:33 2013
@@ -95,4 +95,38 @@ juddi.auth.token.Timeout=15
 # tModelinstanceparms and anything else that references a KeyName
 # default value is true.
 # set to false for backwards compatibility or for a more lax registry
-juddi.validation.enforceReferentialIntegrity=true
\ No newline at end of file
+juddi.validation.enforceReferentialIntegrity=true
+
+#As of 3.1.5 Email delivery options for subscription API functions
+
+#uddi.mail.smtp.from
+##The Operator’s Email address
+
+#juddi.mail.smtp.host
+##The hostname of the SMTP server
+
+#juddi.mail.smtp.port
+##The portname of the SMTP server
+
+#juddi.mail.smtp.socketFactory.class
+##If set, specifies the name of a class that implements the javax.net.SocketFactory interface. This class will be used to create SMTP sockets.
+
+#juddi.mail.smtp.socketFactory.fallback
+##If set to true, failure to create a socket using the specified socket factory class will cause the socket to be created using the java.net.Socket class. Defaults to true.
+
+#juddi.mail.smtp.starttls.enable
+##if true, enables the use of the STARTTLS command (if supported by the server) to switch the connection to a TLS-protected connection before issuing any login commands. Note that an appropriate trust store must configured so that the client will trust the server’s certificate. Defaults to false.
+
+#juddi.mail.smtp.socketFactory.port
+##Specifies the port to connect to when using the specified socket factory. If not set, the default port will be used.
+
+#juddi.mail.smtp.auth
+##If true, attempt to authenticate the user using the AUTH command. Defaults to false.
+
+#juddi.mail.smtp.username
+##Username used to authenticate to the SMTP server
+##used only if juddi.mail.smtp.auth is true
+
+#juddi.mail.smtp.password
+##Password used to authenticate to the SMTP server
+##used only if juddi.mail.smtp.auth is true
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1481240&r1=1481239&r2=1481240&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sat May 11 00:27:33 2013
@@ -34,7 +34,7 @@ import org.apache.juddi.v3.client.config
 import org.apache.juddi.v3.client.config.UDDIClerkManager;
 import org.apache.juddi.v3.client.mapping.BPEL2UDDI;
 import org.apache.juddi.v3.client.mapping.ReadWSDL;
-import org.apache.juddi.v3.client.mapping.URLLocalizerImpl;
+import org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.apache.juddi.v3.client.transport.TransportException;
 import org.apache.juddi.v3.tck.TckBusiness;
@@ -132,7 +132,7 @@ private static Log logger = LogFactory.g
 		properties.put("keyDomain", "riftsaw.jboss.org");
 		properties.put("nodeName", "localhost");
 		properties.put("businessName", "redhat-jboss");
-		BPEL2UDDI bpel2UDDI = new BPEL2UDDI(clerk, new URLLocalizerImpl(), properties);
+		BPEL2UDDI bpel2UDDI = new BPEL2UDDI(clerk, new URLLocalizerDefaultImpl(), properties);
 		
 	    Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/HelloWorld.wsdl");
 		QName serviceName = new QName("http://www.jboss.org/bpel/examples/wsdl","HelloService");



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message