geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r937169 - in /geronimo/server/trunk/plugins/uddi: pom.xml uddi-db/pom.xml uddi-db/src/main/plan/plan.xml uddi-jetty/pom.xml uddi-jetty/src/main/history/dependencies.xml uddi-tomcat/pom.xml uddi-tomcat/src/main/history/dependencies.xml
Date Fri, 23 Apr 2010 07:27:31 GMT
Author: djencks
Date: Fri Apr 23 07:27:31 2010
New Revision: 937169

URL: http://svn.apache.org/viewvc?rev=937169&view=rev
Log:
GERONIMO-5005 latest juddi builds but server does not start. We need to fix juddi

Modified:
    geronimo/server/trunk/plugins/uddi/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Fri Apr 23 07:27:31 2010
@@ -34,10 +34,9 @@
 
     <modules>
         <module>uddi-db</module>
-        <module>geronimo-uddi-server</module>
+        <!--<module>geronimo-uddi-server</module>-->
         <module>uddi-jetty</module>
         <module>uddi-tomcat</module>
-        <module>uddi-jetty-server</module>
   </modules>
 
 
@@ -53,51 +52,21 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.juddi</groupId>
-                <artifactId>juddi</artifactId>
-                <version>2.0rc6</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>avalon-framework</groupId>
-                        <artifactId>avalon-framework</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>logkit</groupId>
-                        <artifactId>logkit</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.juddi</groupId>
-                <artifactId>juddi-ws</artifactId>
-                <version>2.0rc6</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-kernel</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-saaj</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
+                <artifactId>juddiv3-war</artifactId>
+                <version>3.0.1</version>
+                <type>war</type>
+                <scope>provided</scope>
             </dependency>
 
         </dependencies>
     </dependencyManagement>
+
+    <profiles>
+        <profile>
+            <id>mini-servers</id>
+            <modules>
+                <module>uddi-jetty-server</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Fri Apr 23 07:27:31 2010
@@ -139,7 +139,7 @@
                     </module>
                     <instance>
                         <plugin-artifact>
-                            <copy-file relative-to="server" dest-dir="var">var/derby</copy-file>
+                            <copy-file relative-to="server" dest-dir="var/derby">var/derby/</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml Fri Apr 23 07:27:31
2010
@@ -40,6 +40,21 @@
                         </single-pool>
                     </connectionmanager>
                 </connectiondefinition-instance>
+                <connectiondefinition-instance>
+                    <name>jdbc/NoTxJuddiDB</name>
+                    <config-property-setting name="UserName"></config-property-setting>
+                    <config-property-setting name="Password"></config-property-setting>
+                    <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
+                    <config-property-setting name="CreateDatabase">false</config-property-setting>
+                    <connectionmanager>
+                        <no-transaction/>
+                        <single-pool>
+                            <max-size>100</max-size>
+                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml Fri Apr 23 07:27:31 2010
@@ -53,7 +53,15 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
+            <artifactId>cxf-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -66,23 +74,23 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-uddi-server</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddiv3-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi</artifactId>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-ws</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty8</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
@@ -101,13 +109,13 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
+                        <deploymentConfig>${cxfDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
                     <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-uddi-server</artifactId>
-                        <version>${version}</version>
+                        <groupId>org.apache.juddi</groupId>
+                        <artifactId>juddiv3-war</artifactId>
                         <type>war</type>
                     </module>
                 </configuration>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Fri Apr
23 07:27:31 2010
@@ -7,8 +7,13 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>axis</artifactId>
+        <artifactId>cxf</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -17,18 +22,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>uddi-db</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>jetty8</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.juddi</groupId>
-        <artifactId>juddi</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.juddi</groupId>
-        <artifactId>juddi-ws</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-db</artifactId>
+        <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Fri Apr 23 07:27:31 2010
@@ -32,7 +32,7 @@
     <artifactId>uddi-tomcat</artifactId>
     <name>Geronimo Plugins, UDDI Server :: Tomcat</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -49,39 +49,41 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
+            <artifactId>cxf-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>uddi-db</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-uddi-server</artifactId>
+            <artifactId>uddi-db</artifactId>
             <version>${version}</version>
-            <type>war</type>
-            <scope>provided</scope>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi</artifactId>
+            <artifactId>juddiv3-war</artifactId>
+            <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.juddi</groupId>
-            <artifactId>juddi-ws</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
@@ -89,7 +91,7 @@
             <type>car</type>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -100,18 +102,18 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${cxfDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
                     <module>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-uddi-server</artifactId>
-                        <version>${version}</version>
+                        <groupId>org.apache.juddi</groupId>
+                        <artifactId>juddiv3-war</artifactId>
                         <type>war</type>
                     </module>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=937169&r1=937168&r2=937169&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Fri Apr
23 07:27:31 2010
@@ -8,7 +8,7 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>axis</artifactId>
+        <artifactId>cxf</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
@@ -17,18 +17,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>uddi-db</artifactId>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>tomcat7</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.juddi</groupId>
-        <artifactId>juddi</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.juddi</groupId>
-        <artifactId>juddi-ws</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-db</artifactId>
+        <type>car</type>
     </dependency>
 </plugin-artifact>



Mime
View raw message