servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r415273 [2/2] - in /incubator/servicemix/trunk: ./ etc/ geronimo-1.0/ geronimo-1.0/servicemix-gbean/ geronimo-1.0/servicemix-gplan/ geronimo-1.1/ geronimo-1.1/configs/servicemix-deployer/ geronimo-1.1/configs/servicemix/ geronimo-1.1/etc/ g...
Date Mon, 19 Jun 2006 09:55:45 GMT
Modified: incubator/servicemix/trunk/samples/wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/pom.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/pom.xml Mon Jun 19 02:55:39 2006
@@ -23,72 +23,33 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>samples</artifactId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
-
     <groupId>org.apache.servicemix.samples</groupId>
     <artifactId>wsdl-first</artifactId>
     <version>3.0-SNAPSHOT</version>
-
     <name>ServiceMix :: Samples :: WSDL first</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.sun.xml</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.jws</groupId>
-                    <artifactId>jsr181-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>xfire</groupId>
-            <artifactId>xfire-jsr181-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>wsdl-first-http</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
+    <packaging>pom</packaging>
+    
+    <repositories>
+      <repository>
+        <id>apache.snapshots</id>
+        <url>http://people.apache.org/maven-snapshot-repository</url>
+      </repository>
+    </repositories>
+    
+    <modules>
+      <module>jsr181-su</module>
+      <module>http-su</module>
+      <module>sa</module>
+    </modules>
+    
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.0-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                    <wsdlFiles>person.wsdl</wsdlFiles>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${mavenAssemblyPluginVersion}</version>
+                <version>2.1</version>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/assembly/sa.xml</descriptor>
                         <descriptor>src/main/assembly/src.xml</descriptor>
                     </descriptors>
                 </configuration>

Propchange: incubator/servicemix/trunk/samples/wsdl-first/sa/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 19 02:55:39 2006
@@ -0,0 +1 @@
+target

Added: incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Copyright 2005 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 déc. 2005) $ -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.samples</groupId>
+        <artifactId>samples</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+    <artifactId>sa</artifactId>
+    <version>3.0-SNAPSHOT</version>
+    <name>ServiceMix :: Samples :: WSDL first :: SA</name>
+    <packaging>pom</packaging>
+    
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+        <artifactId>jsr181-su</artifactId>
+        <version>3.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+        <artifactId>http-su</artifactId>
+        <version>3.0-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <executions>        
+          <execution>
+            <id>bin</id>
+            <phase>install</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/bin.xml</descriptor>  
+              </descriptors>
+              <finalName>${pom.artifactId}-${pom.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+          </execution>        
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>

Added: incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/bin.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/bin.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/bin.xml Mon Jun 19
02:55:39 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>  
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.apache.servicemix.samples.wsdl-first:jsr181-su</include>
+        <include>org.apache.servicemix.samples.wsdl-first:http-su</include>
+      </includes>        
+    </dependencySet>       
+  </dependencySets>
+</assembly>

Added: incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/jbi.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/jbi.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/jbi.xml Mon
Jun 19 02:55:39 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbi xmlns="http://java.sun.com/xml/ns/jbi" version="1.0">
+     
+   <service-assembly>
+     <identification>
+       <name>wsdl-first</name>
+       <description>WSDL First</description>
+     </identification>
+     <service-unit>
+       <identification>
+         <name>wsdl-first</name>
+         <description>Contains the service</description>
+       </identification>
+       <target>
+         <artifacts-zip>jsr181-su-3.0-SNAPSHOT.jar</artifacts-zip>
+         <component-name>servicemix-jsr181</component-name>
+       </target>
+     </service-unit>
+     <service-unit>
+       <identification>
+         <name>wsdl-first-http</name>
+         <description>Contains the service</description>
+       </identification>
+       <target>
+         <artifacts-zip>http-su-3.0-SNAPSHOT.jar</artifacts-zip>
+         <component-name>servicemix-http</component-name>
+       </target>
+     </service-unit>
+   </service-assembly>
+    
+</jbi>

Modified: incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/src.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/src.xml (original)
+++ incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/src.xml Mon Jun 19 02:55:39
2006
@@ -11,10 +11,10 @@
         <include>LICENSE*</include>
         <include>NOTICE*</include>
         <include>pom.xml</include>
+        <include>src/**/*</include>
+        <include>*/pom.xml</include>
+        <include>*/src/**/*</include>
       </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
     </fileSet>
   </fileSets>
 </assembly>

Modified: incubator/servicemix/trunk/servicemix-bpe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-bpe/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/pom.xml Mon Jun 19 02:55:39 2006
@@ -46,10 +46,20 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-jbi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>servicemix-components</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>servicemix-http</artifactId>
       <scope>test</scope>
@@ -59,6 +69,10 @@
       <artifactId>bpe</artifactId>
     </dependency>
     <dependency>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xbean</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ejb_2.1_spec</artifactId>
       <scope>provided</scope>
@@ -86,6 +100,11 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-eip/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-eip/pom.xml Mon Jun 19 02:55:39 2006
@@ -42,6 +42,7 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>servicemix-services</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Mon Jun 19 02:55:39 2006
@@ -75,6 +75,16 @@
       <artifactId>commons-logging</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-activation</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: incubator/servicemix/trunk/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/pom.xml Mon Jun 19 02:55:39 2006
@@ -59,6 +59,16 @@
       <artifactId>commons-logging</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-activation</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml Mon Jun 19 02:55:39 2006
@@ -41,10 +41,6 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-components</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>servicemix-core</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: incubator/servicemix/trunk/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-soap/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-soap/pom.xml Mon Jun 19 02:55:39 2006
@@ -41,10 +41,12 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-activation</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Mon Jun 19 02:55:39 2006
@@ -60,13 +60,17 @@
     </dependency>
     <dependency>
       <groupId>com.sun.xml</groupId>
-      <artifactId>jaxws-tools</artifactId>
+      <artifactId>jaxb-impl</artifactId>
       <exclusions>
         <exclusion>
           <groupId>javax.jws</groupId>
           <artifactId>jsr181-api</artifactId>
         </exclusion>
       </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxws-api</artifactId>
     </dependency>
     <dependency>
       <groupId>xfire</groupId>



Mime
View raw message