JBossWS SVN: r6104 - stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:06:36 -0400 (Tue, 25 Mar 2008)
New Revision: 6104
Added:
stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/mergeinfo.txt
===================================================================
--- stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/mergeinfo.txt (rev 0)
+++ stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/mergeinfo.txt 2008-03-25 15:06:36 UTC (rev 6104)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6103 - stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:06:09 -0400 (Tue, 25 Mar 2008)
New Revision: 6103
Added:
stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA/mergeinfo.txt
===================================================================
--- stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA/mergeinfo.txt (rev 0)
+++ stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA/mergeinfo.txt 2008-03-25 15:06:09 UTC (rev 6103)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: stack/cxf/branches/jbossws-3.0.1-cxf-1.0.1.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6102 - framework/branches/jbossws-framework-3.0.1.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:05:37 -0400 (Tue, 25 Mar 2008)
New Revision: 6102
Added:
framework/branches/jbossws-framework-3.0.1.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: framework/branches/jbossws-framework-3.0.1.GA/mergeinfo.txt
===================================================================
--- framework/branches/jbossws-framework-3.0.1.GA/mergeinfo.txt (rev 0)
+++ framework/branches/jbossws-framework-3.0.1.GA/mergeinfo.txt 2008-03-25 15:05:37 UTC (rev 6102)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: framework/branches/jbossws-framework-3.0.1.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6101 - common/branches/jbossws-common-1.0.4.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:05:15 -0400 (Tue, 25 Mar 2008)
New Revision: 6101
Added:
common/branches/jbossws-common-1.0.4.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: common/branches/jbossws-common-1.0.4.GA/mergeinfo.txt
===================================================================
--- common/branches/jbossws-common-1.0.4.GA/mergeinfo.txt (rev 0)
+++ common/branches/jbossws-common-1.0.4.GA/mergeinfo.txt 2008-03-25 15:05:15 UTC (rev 6101)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: common/branches/jbossws-common-1.0.4.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6100 - spi/branches/jbossws-spi-1.0.2.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:04:46 -0400 (Tue, 25 Mar 2008)
New Revision: 6100
Added:
spi/branches/jbossws-spi-1.0.2.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: spi/branches/jbossws-spi-1.0.2.GA/mergeinfo.txt
===================================================================
--- spi/branches/jbossws-spi-1.0.2.GA/mergeinfo.txt (rev 0)
+++ spi/branches/jbossws-spi-1.0.2.GA/mergeinfo.txt 2008-03-25 15:04:46 UTC (rev 6100)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: spi/branches/jbossws-spi-1.0.2.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6099 - stack/native/branches/jbossws-3.0.1-native-2.0.4.GA.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 11:03:17 -0400 (Tue, 25 Mar 2008)
New Revision: 6099
Added:
stack/native/branches/jbossws-3.0.1-native-2.0.4.GA/mergeinfo.txt
Log:
[JBWS-2007] adding merge information file
Added: stack/native/branches/jbossws-3.0.1-native-2.0.4.GA/mergeinfo.txt
===================================================================
--- stack/native/branches/jbossws-3.0.1-native-2.0.4.GA/mergeinfo.txt (rev 0)
+++ stack/native/branches/jbossws-3.0.1-native-2.0.4.GA/mergeinfo.txt 2008-03-25 15:03:17 UTC (rev 6099)
@@ -0,0 +1,13 @@
+#
+# This file records SVN merges to trunk that have already been done
+# using this branch. Please use the following format
+#
+#
+# username dd-mmm-yyyy
+# svn merge -r start:end svn url
+#
+# ropalka(a)redhat.com 10-Aug-2007
+# svn merge -r4279:4280 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+#
+# $Id$
+
Property changes on: stack/native/branches/jbossws-3.0.1-native-2.0.4.GA/mergeinfo.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6098 - stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-25 09:42:52 -0400 (Tue, 25 Mar 2008)
New Revision: 6098
Modified:
stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml
Log:
[JBWS-1994] Verify JAX-WS version from repository
Modified: stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml 2008-03-25 13:41:19 UTC (rev 6097)
+++ stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml 2008-03-25 13:42:52 UTC (rev 6098)
@@ -124,7 +124,7 @@
</target>
<!-- Build metro from source -->
- <target name="metro-build" depends="thirdparty-get,metro-copy-jars" description="Build metro from source">
+ <target name="metro-build" depends="metro-copy-jars" description="Build metro from source">
</target>
<target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.metro.available">
@@ -173,7 +173,7 @@
</target>
<!-- Copy the metro jars -->
- <target name="metro-copy-jars" depends="metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available">
+ <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available">
<mkdir dir="${thirdparty.dir}"/>
<property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>
16 years, 3 months
JBossWS SVN: r6097 - stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-25 09:41:19 -0400 (Tue, 25 Mar 2008)
New Revision: 6097
Modified:
stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml
Log:
[JBWS-1994] Verify JAX-WS version from repository
Modified: stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml 2008-03-25 13:32:08 UTC (rev 6096)
+++ stack/metro/branches/jbossws-3.0.1-metro-1.0.1.GA/ant-import/build-thirdparty.xml 2008-03-25 13:41:19 UTC (rev 6097)
@@ -51,7 +51,7 @@
<!--
thirdpartry-get
-->
- <target name="thirdparty-get" depends="thirdparty-delete,metro-copy-jars" if="force.thirdparty.get" description="Gets the thirdparty libraries">
+ <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get" description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
@@ -93,7 +93,7 @@
<checksum file="${int.metro.dir}/version.properties" fileext=".md5"/>
</target>
- <target name="thirdparty-classpath" depends="thirdparty-get">
+ <target name="thirdparty-classpath" depends="thirdparty-get,metro-build">
<!-- The compile classpath for jboss50 integration -->
<path id="metro.integration.classpath">
@@ -124,7 +124,7 @@
</target>
<!-- Build metro from source -->
- <target name="metro-build" depends="metro-copy-jars" description="Build metro from source">
+ <target name="metro-build" depends="thirdparty-get,metro-copy-jars" description="Build metro from source">
</target>
<target name="metro-checkout-dir" depends="thirdparty-init" unless="glassfish.metro.available">
@@ -173,10 +173,45 @@
</target>
<!-- Copy the metro jars -->
- <target name="metro-copy-jars" depends="metro-cvs-build,metro-runtime-jar,metro-tools-jar">
+ <target name="metro-copy-jars" depends="metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available">
<mkdir dir="${thirdparty.dir}"/>
<property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>
+
+ <!-- Verify the JAX-WS Implementation version -->
+ <unjar src="${lib.runtime.dir}/jaxws-rt.jar" dest="${metro.output.lib.dir}/jaxws-rt" overwrite="true">
+ <patternset>
+ <include name="META-INF/MANIFEST.MF"/>
+ </patternset>
+ </unjar>
+ <loadfile property="jaxws.impl.version" srcfile="${metro.output.lib.dir}/jaxws-rt/META-INF/MANIFEST.MF">
+ <filterchain>
+ <linecontains>
+ <contains value="Implementation-Version"/>
+ </linecontains>
+ </filterchain>
+ </loadfile>
+ <condition property="jaxws.impl.version.ok">
+ <equals arg1="${jaxws.impl.version}" arg2="Implementation-Version: ${sun-jaxws}" trim="true"/>
+ </condition>
+ <fail message="Unexpected jax-ws version: ${jaxws.impl.version}" unless="jaxws.impl.version.ok"/>
+
+ <!-- Make sure that NONE of these jars are previously downloaded from the repository -->
+ <available property="jaxws-local-transport.available" filepath="${thirdparty.dir}" file="jaxws-local-transport.jar"/>
+ <available property="stax-utils.available" filepath="${thirdparty.dir}" file="stax-utils.jar"/>
+ <available property="txnannprocessor.available" filepath="${thirdparty.dir}" file="txnannprocessor.jar"/>
+ <available property="xmldsig.available" filepath="${thirdparty.dir}" file="xmldsig.jar"/>
+ <available property="xws-security.available" filepath="${thirdparty.dir}" file="xws-security.jar"/>
+ <available property="resolver.available" filepath="${thirdparty.dir}" file="resolver.jar"/>
+
+ <fail message="jaxws-local-transport.jar already available" if="jaxws-local-transport.available"/>
+ <fail message="stax-utils.jar already available" if="stax-utils.available"/>
+ <fail message="txnannprocessor.jar already available" if="txnannprocessor.available"/>
+ <fail message="xmldsig.jar already available" if="xmldsig.available"/>
+ <fail message="xws-security.jar already available" if="xws-security.available"/>
+ <fail message="resolver.jar already available" if="resolver.available"/>
+
+ <!-- Make sure that these jars are available in the metro build -->
<available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/>
<available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/>
<available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/>
@@ -191,7 +226,7 @@
<fail message="xws-security.jar not available" unless="xws-security.available"/>
<fail message="resolver.jar not available" unless="resolver.available"/>
- <copy todir="${thirdparty.dir}" verbose="true" overwrite="true">
+ <copy todir="${thirdparty.dir}" verbose="true" overwrite="false">
<fileset dir="${lib.runtime.dir}">
<include name="jaxws-local-transport.jar"/>
<include name="stax-utils.jar"/>
@@ -200,7 +235,7 @@
<include name="xws-security.jar"/>
</fileset>
</copy>
- <copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="true"/>
+ <copy file="${lib.runtime.dir}/resolver.jar" tofile="${thirdparty.dir}/wsit-resolver.jar" verbose="true" overwrite="false"/>
<!-- Touch the build marker -->
<touch file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}"/>
16 years, 3 months
JBossWS SVN: r6096 - framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-25 09:32:08 -0400 (Tue, 25 Mar 2008)
New Revision: 6096
Added:
framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
Log:
DAM lifecycle
Added: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java (rev 0)
+++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2008-03-25 13:32:08 UTC (rev 6096)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY 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 along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.framework.deployment;
+
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+
+/**
+ * A deployer that registers the endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 20-Apr-2007
+ */
+public class EndpointRegistryDeploymentAspect extends DeploymentAspect
+{
+ private EndpointRegistry registry;
+
+ public EndpointRegistryDeploymentAspect()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ }
+
+ public void create(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ registry.register(ep);
+ }
+ }
+
+ public void destroy(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ registry.unregister(ep);
+ }
+ }
+}
\ No newline at end of file
Property changes on: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 3 months
JBossWS SVN: r6095 - in framework/branches/jbossws-framework-3.0.1.GA: hudson/hudson-home and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-03-25 08:28:38 -0400 (Tue, 25 Mar 2008)
New Revision: 6095
Modified:
framework/branches/jbossws-framework-3.0.1.GA/ant.properties.example
framework/branches/jbossws-framework-3.0.1.GA/hudson/hudson-home/config.xml
Log:
[JBWS-2004] removing AS 4.2.3 from hudson QA console
Modified: framework/branches/jbossws-framework-3.0.1.GA/ant.properties.example
===================================================================
--- framework/branches/jbossws-framework-3.0.1.GA/ant.properties.example 2008-03-25 12:21:50 UTC (rev 6094)
+++ framework/branches/jbossws-framework-3.0.1.GA/ant.properties.example 2008-03-25 12:28:38 UTC (rev 6095)
@@ -35,10 +35,6 @@
hudson.jboss422.build=jboss-4.2.2.GA
hudson.jboss422.rev=HEAD
-hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss423.build=jboss-4.2.3.GA
-hudson.jboss423.rev=HEAD
-
hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_...
hudson.jboss500.build=jboss-5.0.0.Beta4
hudson.jboss500.rev=HEAD
Modified: framework/branches/jbossws-framework-3.0.1.GA/hudson/hudson-home/config.xml
===================================================================
--- framework/branches/jbossws-framework-3.0.1.GA/hudson/hudson-home/config.xml 2008-03-25 12:21:50 UTC (rev 6094)
+++ framework/branches/jbossws-framework-3.0.1.GA/hudson/hudson-home/config.xml 2008-03-25 12:28:38 UTC (rev 6095)
@@ -15,7 +15,6 @@
<tr><td colspan=2></td></tr>
<tr><th align=left>@hudson.jboss421.build@</th><td>-r(a)hudson.jboss421.rev@ @hudson.jboss421.url@</td></tr>
<tr><th align=left>@hudson.jboss422.build@</th><td>-r(a)hudson.jboss422.rev@ @hudson.jboss422.url@</td></tr>
- <tr><th align=left>@hudson.jboss423.build@</th><td>-r(a)hudson.jboss423.rev@ @hudson.jboss423.url@</td></tr>
<tr><th align=left>@hudson.jboss500.build@</th><td>-r(a)hudson.jboss500.rev@ @hudson.jboss500.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
16 years, 3 months