[jboss-svn-commits] JBL Code SVN: r37095 - in labs/jbossesb/trunk/product: install and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jun 16 22:31:19 EDT 2011


Author: tcunning
Date: 2011-06-16 22:31:18 -0400 (Thu, 16 Jun 2011)
New Revision: 37095

Added:
   labs/jbossesb/trunk/product/lib/ext/jbossws-native-core.jar
   labs/jbossesb/trunk/product/lib/ext/juddi-client-3.1.0-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/juddi-core-3.1.0-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/juddiv3-310-SNAPSHOT.war
   labs/jbossesb/trunk/product/lib/ext/scout-1.2.3-SNAPSHOT.jar
   labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.1.0-SNAPSHOT-jaxws21.jar
Removed:
   labs/jbossesb/trunk/product/product.properties
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/registry/console/InitAttributeServlet.java
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/esb.juddi.client.xml
   labs/jbossesb/trunk/product/install/jboss-service-jbossas5.xml
   labs/jbossesb/trunk/product/install/jboss-service.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/rosetta/build.xml
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientService.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientServiceMBean.java
   labs/jbossesb/trunk/product/services/base-project-build.xml
Log:
JBESB-3618
Upgrade to juddi 3.1.0 snapshots.


Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/build-distr.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -88,13 +88,13 @@
 
         <mkdir dir="${build.dir}/jbossesb.sar/lib"/>
         <copy todir="${build.dir}/jbossesb.sar/lib">
-            <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar jbossesb-transport*.jar jbossesb-cxf*.jar"/>
+            <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar jbossesb-transport*.jar"/>
             <!-- xbean for reading/marchalling xml for configuration, and scout -->
             <fileset dir="${lib.dir}" includes="xbean*.jar"/>
             <fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
             <!-- jUDDI Registry, we're one -->
-	    <fileset dir="${lib.dir}" includes="scout-*.jar"/>
-	    <fileset dir="${lib.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar"/>
+	    <fileset dir="${lib.ext.dir}" includes="scout-*.jar"/>
+	    <fileset dir="${lib.ext.dir}" includes="juddi-client-*.jar, uddi-ws-*.jar"/>
 	    <fileset dir="${lib.dir}" includes="commons-configuration-*.jar,commons-codec-*.jar"/>
             <!-- camel -->
             <fileset dir="${lib.dir}" includes="camel-core-*.jar"/>
@@ -135,7 +135,7 @@
                 <include name="esb.juddi.xml"/>
                 <include name="juddi-sql/**"/>
             </fileset>
-	    <fileset dir="${lib.dir}" includes="juddi-core-*.jar"/>
+	    <fileset dir="${lib.ext.dir}" includes="juddi-core-*.jar"/>
             <fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
 	</copy>		
 

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/install/build.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -228,10 +228,16 @@
 	        <copy file="${org.jboss.esb.dist.lib}/Licenses.txt" tofile="${org.jboss.esb.server.home}/EsbLicences.txt"/>
 	    </target>
 
-	<target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config" description="Deploys Internal Services to the JBossAS5">
-		<echo message="Deploy to JBossAS5"/>
+	<target name="internal.deploy.jbossas5.only" if="jbossas5" unless="jbossas6">
+		<property name="deployers.dir" value="${server.dir}/deployers"/>
+
+		<copy file="${org.jboss.esb.dist.lib}/ext/jbossws-native-core.jar" todir="${deployers.dir}/jbossws.deployer" overwrite="true"/>	
+	</target>
+
+	<target name="internal.deploy.jbossas5" if="jbossas5" depends="check.deploy.props, dependencies, jms.config, internal.deploy.jbossas5.only" description="Deploys Internal Services to the JBossAS5">
+	<echo message="Deploy to JBossAS5"/>
 		
-		<!-- jbossesb deployer -->
+	<!-- jbossesb deployer -->
         <property name="deployers.dir" value="${server.dir}/deployers"/>
         <mkdir dir="${deployers.dir}/esb.deployer"/>
 		        
@@ -274,14 +280,14 @@
             </fileset>
         </copy>
 		
-		<copy todir="${deployers.dir}/esb.deployer/META-INF" overwrite="true">
+	<copy todir="${deployers.dir}/esb.deployer/META-INF" overwrite="true">
             <fileset dir="${basedir}">
                 <include name="esb-deployers-jboss-beans.xml"/>
                 <include name="jboss-structure.xml"/>
             </fileset>
         </copy>
 		
-		<copy todir="${deployers.dir}/esb.deployer" overwrite="true">
+	<copy todir="${deployers.dir}/esb.deployer" overwrite="true">
             <fileset dir="${org.jboss.esb.dist.lib}/jbossesb.sar">
                 <include name="actionArtifactMap.properties"/>
                 <include name="jbossesb-properties.xml"/>
@@ -340,8 +346,13 @@
                 <exclude name="lib/uddi-ws-*.jar"/>
             </fileset>
         </copy>
-		<copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
 
+	<copy todir="${deploy.dir}"
+		file="${org.jboss.esb.dist.lib}/juddiv3-310-SNAPSHOT.war"/>
+
+
+	<copy tofile="${deploy.dir}/jbossesb.sar/META-INF/jboss-service.xml" file="${basedir}/jboss-service-jbossas5.xml" overwrite="true"/>
+
         <copy todir="${deploy.dir}/jbossesb-registry.sar" includeemptydirs="false" overwrite="true">
             <fileset dir="${org.jboss.esb.dist.lib}/jbossesb-registry.sar" excludes="${registry.config}"/>
         </copy>

Modified: labs/jbossesb/trunk/product/install/jUDDI-registryV3/esb.juddi.client.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/esb.juddi.client.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/esb.juddi.client.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -4,7 +4,7 @@
     <reloadDelay>3600000</reloadDelay>
     <manager name="uddi-portlet-manager">
         <nodes>
-            <node>
+            <node isHomeJUDDI="true">
                 <!-- required 'default' node -->
                 <name>default</name> 
                 <description>Main jUDDI node</description>

Modified: labs/jbossesb/trunk/product/install/jboss-service-jbossas5.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service-jbossas5.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/install/jboss-service-jbossas5.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -17,6 +17,7 @@
 	<mbean code="org.jboss.internal.soa.esb.dependencies.JuddiClientService" name="jboss.esb:service=JuddiClient" description="Juddi Client Service">
 		<attribute name="PropertiesResourceFile">esb.juddi.client.xml</attribute>
 		<attribute name="PropertiesFileDir">${jboss.server.temp.dir}</attribute>
+		<attribute name="NodeName">default</attribute>
 		<depends>jboss.esb:service=JuddiRMI</depends>
 	</mbean>
 

Modified: labs/jbossesb/trunk/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/install/jboss-service.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -24,6 +24,7 @@
 	<mbean code="org.jboss.internal.soa.esb.dependencies.JuddiClientService" name="jboss.esb:service=JuddiClient" description="Juddi Client Service">
 		<attribute name="PropertiesResourceFile">esb.juddi.client.xml</attribute>
 		<attribute name="PropertiesFileDir">${jboss.server.data.dir}</attribute>
+		<attribute name="NodeName">default</attribute>
 		<depends>jboss.esb:service=JuddiRMI</depends>
 	</mbean>
 

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/ivy.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -33,7 +33,9 @@
         <dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
 
         <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
+<!--
         <dependency org="org.apache.ws.scout" name="scout" rev="1.2.2"/>
+-->
         <dependency org="org.apache.camel" name="camel-core" rev="2.4.0"/>
         <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0"/>
 
@@ -43,9 +45,11 @@
         <dependency org="jboss" name="jboss" rev="4.2.3.GA"/>
         <dependency org="org.jboss.client" name="jbossall-client" rev="4.2.3.GA"/>
         <dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
+<!--
 	<dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.4"/>
 	<dependency org="org.apache.juddi" name="juddi-client" rev="3.0.4"/>
 	<dependency org="org.apache.juddi" name="juddi-core" rev="3.0.4"/>
+-->
 	
 	<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
         <dependency org="log4j" name="log4j" rev="1.2.14"/>

Added: labs/jbossesb/trunk/product/lib/ext/jbossws-native-core.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/jbossws-native-core.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/lib/ext/juddi-client-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/juddi-client-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/lib/ext/juddi-core-3.1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/juddi-core-3.1.0-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/lib/ext/juddiv3-310-SNAPSHOT.war
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/juddiv3-310-SNAPSHOT.war
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/lib/ext/scout-1.2.3-SNAPSHOT.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/scout-1.2.3-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.1.0-SNAPSHOT-jaxws21.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/lib/ext/uddi-ws-3.1.0-SNAPSHOT-jaxws21.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: labs/jbossesb/trunk/product/product.properties
===================================================================
--- labs/jbossesb/trunk/product/product.properties	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/product.properties	2011-06-17 02:31:18 UTC (rev 37095)
@@ -1,20 +0,0 @@
-# JBossESB ant properties file
-# $Id$
-#
-org.jboss.esb.build.deprecation=yes
-org.jboss.esb.build.optimize=off
-org.jboss.esb.build.debug=yes
-
-# uncomment the following if you wish to use an app server installation
-# for tests instead of the included jbossesb-server
-#org.jboss.esb.server.home=<app server home>
-
-# Uncomment all the ftp properties if you wish to override the ftp server
-#org.jboss.esb.test.ftp.hostname=<hostname:port>
-#org.jboss.esb.test.ftp.user=<username>
-#org.jboss.esb.test.ftp.pwd=<password>
-#org.jboss.esb.test.ftp.dir=<base directory>
-
-# Uncomment the following if you want more control over junit	 
-#org.jboss.esb.junit.haltonerror=yes	 
-#org.jboss.esb.junit.haltonfailure=yes
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/rosetta/build.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -7,7 +7,7 @@
     <property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
     <property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
 
-    <property name="uddi.webservices.jar" value="uddi-ws-3.0.4.jar"/>
+    <property name="uddi.webservices.jar" value="uddi-ws-3.1.0-SNAPSHOT-jaxws21.jar"/>
     <property name="juddi.v3.war" value="juddiv3-3.0.2.war"/>
     <property name="juddi.v3.wsdl.location" value="org/jboss/internal/soa/esb/registry/client/wsdl"/>
     <property name="juddi.v3.wsdl.dir" location="juddiv3.wsdl"/>
@@ -95,15 +95,7 @@
         <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
     </target>
 
-    <target name="java.6.check">
-	<echo>Checking java.version....</echo>
-	<echo>ant.java.version=${ant.java.version}</echo>
-	<condition property="java6.set">
-            <equals arg1="${ant.java.version}" arg2="1.6" />
-        </condition>
-    </target>
-
-    <target name="as6.dependencies.get" depends="java.6.check" if="java6.set">
+    <target name="as6.dependencies.get">
         <ant antfile="${org.jboss.esb.rosetta.as6.dir}/ivy-build.xml"/>
 	<property name="as6.jar.files" refid="org.jboss.esb.rosetta.as6.classpath"/>
         <echo>as6.jar.files=${as6.jar.files}</echo>
@@ -115,7 +107,7 @@
     </target>
     
     <target name="as6.compile" depends="org.jboss.esb.rosetta.prepare, as6.dependencies.get"
-        description="Compile the AS6 deployer" if="java6.set">
+        description="Compile the AS6 deployer">
         <javac
             destdir="${org.jboss.esb.rosetta.classes.dir}"
             classpathref="org.jboss.esb.rosetta.as6.classpath"
@@ -178,7 +170,7 @@
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security.xml"/>
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="org/jboss/soa/esb/services/security/auth/ws/smooks-ws-security-template.xml"/>
 			<fileset dir="${org.jboss.esb.rosetta.src.dir}" includes="xmldsig-core-schema.xsd"/>
-            <zipfileset src="${org.jboss.esb.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
+            <zipfileset src="${org.jboss.esb.ext.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
                 excludes="uddi_v3replication.xsd" prefix="${juddi.v3.wsdl.location}"/>
             <zipfileset dir="${juddi.v3.wsdl.dir}" prefix="${juddi.v3.wsdl.location}"/>
        	</jar>
@@ -328,9 +320,11 @@
             <zipfileset dir="${org.jboss.esb.registry.war.resources.dir}"/>
             <zipfileset dir="${juddi.v3.wsdl.dir}" prefix="WEB-INF/wsdl"/>
             <zipfileset dir="${org.jboss.esb.registry.war.classes.dir}" prefix="WEB-INF/classes"/>
-            <zipfileset src="${org.jboss.esb.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
+            <zipfileset src="${org.jboss.esb.ext.lib.dir}/${uddi.webservices.jar}" includes="uddi*.xsd"
                 excludes="uddi_v3replication.xsd" prefix="WEB-INF/wsdl"/>
             <zipfileset src="${org.jboss.esb.ext.lib.dir}/${juddi.v3.war}" includes="WEB-INF/classes/**/NotifyServlet.class"/>
         </zip>
+	
+	<copy file="${org.jboss.esb.ext.lib.dir}/juddiv3-310-SNAPSHOT.war" todir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
     </target>
 </project>

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientService.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientService.java	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientService.java	2011-06-17 02:31:18 UTC (rev 37095)
@@ -45,7 +45,8 @@
     
     private String propertiesResourceFile ;
     private String propertiesFileDir;
-    
+    private String nodeName;
+    private String managerName;
     private UDDIClerkManager manager;
 
     public String getPropertiesResourceFile()
@@ -57,7 +58,23 @@
     {
        this.propertiesResourceFile = propertiesResourceFile;
     }
-    
+
+    public String getNodeName() {
+       return this.nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+      this.nodeName = nodeName;
+    }
+
+    public String getManagerName() {
+      return this.managerName;
+    }
+
+    public void setManagerName(String managerName) {
+      this.managerName = managerName;
+    }
+
     protected void startService() throws Exception
     {
          logger.info("starting juddi client service");
@@ -117,6 +134,10 @@
          // addClerkManager must precede manager.start() to avoid a race in jUDDI, do not change this order.
          UDDIClientContainer.addClerkManager(manager) ;
          manager.start();
+	 this.managerName = this.manager.getName();
+         System.setProperty("org.apache.juddi.v3.client.manager.name", this.manager.getName());
+         System.setProperty("org.apache.juddi.v3.client.node.name", this.nodeName);
+         super.startService();
      }
 
 
@@ -126,6 +147,7 @@
          {
              manager.stop() ;
          }
+         super.stopService();
      }
 
      public void setPropertiesFileDir(final String directory)

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientServiceMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientServiceMBean.java	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/JuddiClientServiceMBean.java	2011-06-17 02:31:18 UTC (rev 37095)
@@ -28,6 +28,12 @@
 {
    String getPropertiesResourceFile() ;
 
+   String getNodeName();
+
+   void setNodeName(String nodeName); 
+
+   String getManagerName();
+
    void setPropertiesResourceFile(String propertiesResourceFile) ;
    
    void setPropertiesFileDir(final String directory);

Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/registry/console/InitAttributeServlet.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/registry/console/InitAttributeServlet.java	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/registry/console/InitAttributeServlet.java	2011-06-17 02:31:18 UTC (rev 37095)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.internal.soa.esb.registry.console;
-
-import java.io.IOException;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.v3.client.config.UDDIClerkManager;
-import org.apache.juddi.v3.client.config.UDDIClerkServlet;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.config.WebHelper;
-import org.apache.log4j.Logger;
-
-/**
- * Simple servlet to initialise the context attributes.
- * @author kevin
- */
-public class InitAttributeServlet extends GenericServlet
-{
-    /**
-     * serial version UID for this class
-     */
-    private static final long serialVersionUID = -2813854722227002890L;
-
-    /**
-     * The logger for this class.
-     */
-    private static final Logger LOGGER = Logger.getLogger(InitAttributeServlet.class) ;
-    
-    /**
-     * Initialise the servlet configuration.
-     * @param config The servlet configuration.
-     */
-    @Override
-    public void init(ServletConfig config)
-        throws ServletException
-    {
-        super.init(config) ;
-        final String managerName = config.getInitParameter(UDDIClerkServlet.UDDI_CLIENT_MANAGER_NAME) ;
-        if (managerName != null)
-        {
-            final UDDIClerkManager manager ;
-            try
-            {
-                manager = UDDIClientContainer.getUDDIClerkManager(managerName) ;
-            }
-            catch (final ConfigurationException ce)
-            {
-                throw new ServletException("Failed to locate manager: " + managerName, ce) ;
-            }
-            
-            if (manager != null)
-            {
-                if (LOGGER.isInfoEnabled())
-                {
-                    LOGGER.info("Initialising jUDDI console context with manager " + managerName) ;
-                }
-                final ServletContext servletContext = config.getServletContext() ;
-                servletContext.setAttribute(WebHelper.JUDDI_CLIENT_MANAGER_INSTANCE, manager) ;
-            }
-        }
-    }
-    
-    @Override
-    public void service(final ServletRequest request, final ServletResponse response)
-        throws ServletException, IOException
-    {
-        throw new ServletException("Servlet is only used for specific context initialisation tasks") ;
-    }
-}

Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml	2011-06-15 14:07:41 UTC (rev 37094)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml	2011-06-17 02:31:18 UTC (rev 37095)
@@ -74,8 +74,8 @@
         <fileset dir="${esb.main.lib}" includes="jboss-ejb-api*.jar"/>
         <fileset dir="${esb.main.lib}" includes="jbossall-client*.jar"/>
         <fileset dir="${esb.main.lib}" includes="jcr*.jar"/>
-        <fileset dir="${esb.main.lib}" includes="juddi-client*.jar"/>
-        <fileset dir="${esb.main.lib}" includes="juddi-core*.jar"/>
+        <fileset dir="${esb.root.dir}/lib/ext" includes="juddi-client*.jar"/>
+        <fileset dir="${esb.root.dir}/lib/ext" includes="juddi-core*.jar"/>
         <fileset dir="${esb.main.lib}" includes="log4j*.jar"/>
         <fileset dir="${esb.main.lib}" includes="mail*.jar"/>
         <fileset dir="${esb.main.lib}" includes="milyn-smooks-*.jar"/>
@@ -85,9 +85,9 @@
         <fileset dir="${esb.main.lib}" includes="ognl*.jar"/>
         <fileset dir="${esb.main.lib}" includes="picketlink*.jar"/>
         <fileset dir="${esb.main.lib}" includes="quartz*.jar"/>
-        <fileset dir="${esb.main.lib}" includes="scout*.jar"/>
+        <fileset dir="${esb.root.dir}/lib/ext" includes="scout*.jar"/>
         <fileset dir="${esb.main.lib}" includes="stax-api*.jar"/>
-        <fileset dir="${esb.main.lib}" includes="uddi-ws*.jar"/>
+        <fileset dir="${esb.root.dir}/lib/ext" includes="uddi-ws*.jar"/>
         <fileset dir="${esb.main.lib}" includes="xbean*.jar"/>
         <fileset dir="${esb.main.lib}" includes="xstream*.jar"/>
         <pathelement location="${esb.root.dir}/etc/test/registry"/>



More information about the jboss-svn-commits mailing list