[jbossws-commits] JBossWS SVN: r5886 - in stack/native/trunk: src/main/etc and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-03-06 16:58:45 -0500 (Thu, 06 Mar 2008)
New Revision: 5886

Removed:
   stack/native/trunk/src/main/etc/component-info42.xml
   stack/native/trunk/src/main/etc/component-info50.xml
Modified:
   stack/native/trunk/ant-import/build-release.xml
   stack/native/trunk/src/main/etc/component-info.xml
Log:
Remove repository components jbossws-native42, jbossws-native50

Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml	2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/ant-import/build-release.xml	2008-03-06 21:58:45 UTC (rev 5886)
@@ -38,7 +38,7 @@
   <target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals" 
     description="Release to jboss.local.repository">
 
-    <!-- jboss/jbossws -->
+    <!-- jboss/jbossws-native -->
     <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
     <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/bin"/>
     <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
@@ -64,44 +64,18 @@
       </fileset>
     </copy>
     <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true">
-      <fileset dir="${core.dir}/src/main/resources/standard-config">
+      <fileset dir="${core.resources.dir}/standard-config">
         <include name="standard-*-config.xml"/>
       </fileset>
+      <fileset dir="${core.resources.dir}">
+        <include name="jbossws-native-config.xml"/>
+      </fileset>
     </copy>
     <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true">
       <filterset>
         <filtersfile file="${core.dir}/version.properties"/>
       </filterset>
     </copy>
-	  
-    <!-- jboss/jbossws-native50 -->
-    <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
-    <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources"/>
-    <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources" overwrite="true">
-      <fileset dir="${core.output.lib.dir}/jbossws-native50">
-        <include name="jbossws-beans.xml"/>
-      </fileset>
-    </copy>
-    <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info50.xml" filtering="true" overwrite="true">
-      <filterset>
-        <filtersfile file="${core.dir}/version.properties"/>
-      </filterset>
-    </copy>
-    
-    <!-- jboss/jbossws-native42 -->
-    <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
-    <mkdir dir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib"/>
-    <copy todir="${jboss.repository.dir}/jbossws-native42/${repository.id}/lib" overwrite="true">
-      <fileset dir="${core.dir}/output/lib">
-        <include name="jbossws-native42.sar"/>
-      </fileset>
-    </copy>
-    <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info42.xml" filtering="true" overwrite="true">
-      <filterset>
-        <filtersfile file="${core.dir}/version.properties"/>
-      </filterset>
-    </copy>
-    
   </target>
 
   <target name="check-svn-externals" depends="init">

Modified: stack/native/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info.xml	2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info.xml	2008-03-06 21:58:45 UTC (rev 5886)
@@ -17,11 +17,25 @@
     <artifact id="standard-jaxrpc-endpoint-config.xml"/>
     <artifact id="standard-jaxws-client-config.xml"/>
     <artifact id="standard-jaxws-endpoint-config.xml"/>
+    <artifact id="jbossws-native-config.xml"/>
     <artifact id="wsrunclient.bat"/>
     <artifact id="wsrunclient.sh"/>
     <artifact id="wstools.bat"/>
     <artifact id="wstools.sh"/>
 
+    <import componentref="jboss/jbossxb">
+      <compatible version="@jboss-jbossxb-jboss42@"/>
+      <compatible version="@jboss-jbossxb-jboss42 at -brew"/>
+      <compatible version="@jboss-jbossxb-jboss50@"/>
+      <compatible version="@jboss-jbossxb-jboss50 at -brew"/>
+    </import>
+    <import componentref="jboss/remoting">
+      <compatible version="@jboss-remoting-jboss42@"/>
+      <compatible version="@jboss-remoting-jboss42 at -brew"/>
+      <compatible version="@jboss-remoting-jboss50@"/>
+      <compatible version="@jboss-remoting-jboss50 at -brew"/>
+    </import>
+    
     <import componentref="jboss/jaxbintros">
       <compatible version="@jboss-jaxbintros@"/>
     </import>

Deleted: stack/native/trunk/src/main/etc/component-info42.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info42.xml	2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info42.xml	2008-03-06 21:58:45 UTC (rev 5886)
@@ -1,27 +0,0 @@
-<project name="jboss/jbossws-native42">
-  
-  <component id="jboss/jbossws-native42"
-    description="JBossWS an implementation of J2EE Web Services" 
-    version="@repository.id@"
-    licenseType="lgpl">
-    
-    <artifact id="jbossws-native42.sar"/>
-    
-    <import componentref="jboss/jbossws">
-      <compatible version="@repository.id@"/>
-    </import>
-    <import componentref="jboss/jbossxb">
-      <compatible version="@jboss-jbossxb-jboss42@"/>
-      <compatible version="@jboss-jbossxb-jboss42 at -brew"/>
-    </import>
-    <import componentref="jboss/remoting">
-      <compatible version="@jboss-remoting-jboss42@"/>
-      <compatible version="@jboss-remoting-jboss42 at -brew"/>
-    </import>
-    
-    <export>
-    </export>
-    
-  </component>
-  
-</project>

Deleted: stack/native/trunk/src/main/etc/component-info50.xml
===================================================================
--- stack/native/trunk/src/main/etc/component-info50.xml	2008-03-06 20:50:48 UTC (rev 5885)
+++ stack/native/trunk/src/main/etc/component-info50.xml	2008-03-06 21:58:45 UTC (rev 5886)
@@ -1,27 +0,0 @@
-<project name="jboss/jbossws-native50">
-  
-  <component id="jboss/jbossws-native50"
-    description="JBossWS an implementation of J2EE Web Services" 
-    version="@repository.id@"
-    licenseType="lgpl">
-    
-    <artifact id="jbossws-beans.xml"/>
-    
-    <import componentref="jboss/jbossws">
-      <compatible version="@repository.id@"/>
-    </import>
-    <import componentref="jboss/jbossxb">
-      <compatible version="@jboss-jbossxb-jboss50@"/>
-      <compatible version="@jboss-jbossxb-jboss50 at -brew"/>
-    </import>
-    <import componentref="jboss/remoting">
-      <compatible version="@jboss-remoting-jboss50@"/>
-      <compatible version="@jboss-remoting-jboss50 at -brew"/>
-    </import>
-    
-    <export>
-    </export>
-    
-  </component>
-  
-</project>