[jbossws-commits] JBossWS SVN: r1261 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/jaxrpc src/main/resources/jbossws.war/Tomcat/WEB-INF src/test/ant

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-10-19 03:57:55 -0400 (Thu, 19 Oct 2006)
New Revision: 1261

Modified:
   branches/jbossws-1.0/ant.properties.example
   branches/jbossws-1.0/build.xml
   branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
   branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml
   branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
Log:
Fix Tomcat integration

Modified: branches/jbossws-1.0/ant.properties.example
===================================================================
--- branches/jbossws-1.0/ant.properties.example	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/ant.properties.example	2006-10-19 07:57:55 UTC (rev 1261)
@@ -12,7 +12,7 @@
 jboss.server.instance=default
 
 # Tomcat Home
-#tomcat.home=/usr/java/apache/tomcat
+#tomcat.home=/usr/java/tomcat
 #tomcat.manager.username=manager
 #tomcat.manager.password=manager
 

Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/build.xml	2006-10-19 07:57:55 UTC (rev 1261)
@@ -305,9 +305,9 @@
         <include name="META-INF/standard-jaxrpc-client-config.xml"/>
         <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
       </fileset>
-      <!--classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF">
+      <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF">
         <include name="log4j.xml"/>
-      </classes-->
+      </classes>
     </war>
 
     <!-- Build jbossws.sar -->

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java	2006-10-19 07:57:55 UTC (rev 1261)
@@ -130,12 +130,7 @@
 
          log.debug("END buildMetaData: " + wsMetaData);
          wsMetaData.eagerInitialize();
-         
-         // Only validate if configuration was provided
-         // In case of DII the handlers may be configured later
-         if (serviceRefMetaData != null)
-            wsMetaData.validate();
-         
+         wsMetaData.validate();
          return serviceMetaData;
       }
       catch (RuntimeException rte)

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java	2006-10-19 07:57:55 UTC (rev 1261)
@@ -552,9 +552,6 @@
       // Check or generate the the schema if this call is unconfigured
       generateOrUpdateSchemas(opMetaData);
       
-      // Validate the meta data model. In case of DII, the model may not be valid before the invocation  
-      opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().validate();
-
       // Associate a message context with the current thread
       SOAPMessageContextJAXRPC msgContext = new SOAPMessageContextJAXRPC();
       MessageContextAssociation.pushMessageContext(msgContext);

Modified: branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/src/main/resources/jbossws.war/Tomcat/WEB-INF/log4j.xml	2006-10-19 07:57:55 UTC (rev 1261)
@@ -22,7 +22,7 @@
 
   <!-- A time/date based rolling appender -->
   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
-    <param name="File" value="/usr/java/apache/tomcat/logs/jbossws.log"/>
+    <param name="File" value="/usr/java/tomcat/logs/jbossws.log"/>
     <param name="Append" value="false"/>
 
     <!-- Rollover at midnight each day -->

Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml	2006-10-19 00:46:36 UTC (rev 1260)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml	2006-10-19 07:57:55 UTC (rev 1261)
@@ -601,7 +601,6 @@
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
         <include name="jboss-wsse-server.xml"/>
-        <include name="jboss-web.xml"/>
         <include name="wsdl/*"/>
       </webinf>
       <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
@@ -1443,7 +1442,6 @@
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="jaxrpc-mapping.xml"/>
         <include name="webservices.xml"/>
-        <include name="jboss-web.xml"/>
         <include name="wsdl/**"/>
       </webinf>
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
@@ -1480,7 +1478,6 @@
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
         <include name="webservices.xml"/>
         <include name="jaxrpc-mapping.xml"/>
-        <include name="jboss-web.xml"/>
         <include name="wsdl/**"/>
       </webinf>
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
@@ -1524,9 +1521,6 @@
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
         <include name="jboss-wsse-server.xml"/>
       </webinf>
-      <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF">
-        <include name="jboss-web.xml"/>
-      </webinf>
       <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
         <include name="wsse.keystore"/>
         <include name="wsse.truststore"/>