You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/11/01 00:00:45 UTC

svn commit: r469695 [1/3] - in /incubator/servicemix/branches/servicemix-3.0: ./ apache-servicemix/ build/ geronimo/ geronimo/deployer-service/ geronimo/deployer/ geronimo/servicemix-service/ geronimo/servicemix/ samples/ samples/basic/ samples/bridge/...

Author: gnodet
Date: Tue Oct 31 15:00:43 2006
New Revision: 469695

URL: http://svn.apache.org/viewvc?view=rev&rev=469695
Log:
Rollback failed release

Modified:
    incubator/servicemix/branches/servicemix-3.0/apache-servicemix/pom.xml
    incubator/servicemix/branches/servicemix-3.0/build/pom.xml
    incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/pom.xml
    incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/pom.xml
    incubator/servicemix/branches/servicemix-3.0/geronimo/pom.xml
    incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix-service/pom.xml
    incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/pom.xml
    incubator/servicemix/branches/servicemix-3.0/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/basic/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-eip-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-http-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-jms-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-sa/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-xslt-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/bridge/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/loan-broker/loan-broker-bpe-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/loan-broker/loan-broker-lw-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/loan-broker/loan-broker-sa/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/loan-broker/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/servicemix-web/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/wsdl-first/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/wsdl-first/wsdl-first-http-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/wsdl-first/wsdl-first-jsr181-su/pom.xml
    incubator/servicemix/branches/servicemix-3.0/samples/wsdl-first/wsdl-first-sa/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-beanflow/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-bpe/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-common/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-components/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-console/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-core/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-eip/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-http/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-itests/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-jbi/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-jms/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-jsr181/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-lwcontainer/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-sca/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-services/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-shared/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-soap/pom.xml
    incubator/servicemix/branches/servicemix-3.0/servicemix-wsn2005/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/jbi-maven-plugin/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-archetypes-itests/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-binding-component/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-eip-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-embedded-simple/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-http-consumer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-http-provider-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-jms-consumer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-jms-provider-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-jsr181-wsdl-first-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-lwcontainer-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-service-assembly/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-service-engine/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-service-unit/pom.xml
    incubator/servicemix/branches/servicemix-3.0/tooling/servicemix-shared-library/pom.xml

Modified: incubator/servicemix/branches/servicemix-3.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/apache-servicemix/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/apache-servicemix/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,11 +1,32 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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</groupId>
     <artifactId>servicemix</artifactId>
-    <version>3.0.2-incubating-SNAPSHOT</version>
+    <version>3.0.1-incubating-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-servicemix</artifactId>
@@ -388,4 +409,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/build/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/build/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/build/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/build/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,14 +1,35 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.servicemix</groupId>
-    <artifactId>servicemix</artifactId>
-    <version>3.0.2-incubating-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>build</artifactId>
-  <name>Servicemix :: Build</name>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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</groupId>
+    <artifactId>servicemix</artifactId>
+    <version>3.0.1-incubating-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>build</artifactId>
+  <name>Servicemix :: Build</name>
+
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/geronimo/deployer-service/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,54 +1,75 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>deployer-service</artifactId>
-    <name>ServiceMix :: Geronimo :: Deployer service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix-service</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>deployer-service</artifactId>
+    <name>ServiceMix :: Geronimo :: Deployer service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix-service</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/geronimo/deployer/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,82 +1,103 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>deployer</artifactId>
-    <name>ServiceMix :: Geronimo :: Deployer plugin</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <!-- For build ordering -->
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>deployer-service</artifactId>
-            <version>${servicemix-version}</version>
-            <scope>provided</scope>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix</artifactId>
-            <version>${servicemix-version}</version>
-            <scope>provided</scope>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/resources/META-INF</directory>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${car-maven-plugin-version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
-                    <planFileName>geronimo-service.xml</planFileName>
-                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/deployer-service/${pom.version}/deployer-service-${pom.version}.jar</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>    
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>deployer</artifactId>
+    <name>ServiceMix :: Geronimo :: Deployer plugin</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <!-- For build ordering -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>deployer-service</artifactId>
+            <version>${servicemix-version}</version>
+            <scope>provided</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix</artifactId>
+            <version>${servicemix-version}</version>
+            <scope>provided</scope>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/resources/META-INF</directory>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${car-maven-plugin-version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
+                    <planFileName>geronimo-service.xml</planFileName>
+                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/deployer-service/${pom.version}/deployer-service-${pom.version}.jar</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/geronimo/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/geronimo/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,249 +1,270 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>servicemix</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
-    <name>Servicemix :: Geronimo</name>
-    <packaging>pom</packaging>
-  
-    <properties>
-        <car-maven-plugin-version>1.1</car-maven-plugin-version>
-    </properties>
-    
-    <modules>
-        <module>servicemix-service</module>
-        <module>deployer-service</module>
-        <module>servicemix</module>
-        <module>deployer</module>
-    </modules>
-
-    <!-- The purpose of the following dependencies
-         is only to force maven to download them
-         so that the car plugin can find all the 
-         needed jars/cars in the local maven repo -->
-    <dependencies>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-client</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-util</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>1.4.3</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>2.0-r118</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>howl</groupId>
-            <artifactId>howl-logger</artifactId>
-            <version>0.1.11</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.0_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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</groupId>
+        <artifactId>servicemix</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <name>Servicemix :: Geronimo</name>
+    <packaging>pom</packaging>
+  
+    <properties>
+        <car-maven-plugin-version>1.1</car-maven-plugin-version>
+    </properties>
+    
+    <modules>
+        <module>servicemix-service</module>
+        <module>deployer-service</module>
+        <module>servicemix</module>
+        <module>deployer</module>
+    </modules>
+
+    <!-- The purpose of the following dependencies
+         is only to force maven to download them
+         so that the car plugin can find all the 
+         needed jars/cars in the local maven repo -->
+    <dependencies>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>rmi-naming</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-webservices</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo-version}</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>1.4.3</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>2.0-r118</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+            <version>0.1.11</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.0_spec</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix-service/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix-service/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix-service/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,42 +1,63 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>servicemix-service</artifactId>
-    <name>ServiceMix :: Geronimo :: ServiceMix service</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-core</artifactId>
-            <version>${servicemix-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>servicemix-service</artifactId>
+    <name>ServiceMix :: Geronimo :: ServiceMix service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-core</artifactId>
+            <version>${servicemix-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${geronimo-version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/geronimo/servicemix/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,68 +1,89 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>servicemix</artifactId>
-    <name>ServiceMix :: Geronimo :: ServiceMix plugin</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <!-- For build ordering -->
-        <dependency>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix-service</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-            <scope>provided</scope>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/resources/META-INF</directory>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${car-maven-plugin-version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <deploymentConfigs>
-                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
-                    </deploymentConfigs>
-                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
-                    <planFileName>geronimo-service.xml</planFileName>
-                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/servicemix-service/${pom.version}/servicemix-service-${pom.version}.jar</moduleFile>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>    
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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.geronimo</groupId>
+        <artifactId>geronimo</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>servicemix</artifactId>
+    <name>ServiceMix :: Geronimo :: ServiceMix plugin</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <!-- For build ordering -->
+        <dependency>
+            <groupId>org.apache.servicemix.geronimo</groupId>
+            <artifactId>servicemix-service</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+            <scope>provided</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${geronimo-version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/resources/META-INF</directory>
+                <includes>
+                    <include>geronimo-plugin.xml</include>
+                </includes>
+                <targetPath>META-INF</targetPath>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${car-maven-plugin-version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
+                    </deploymentConfigs>
+                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
+                    <planFileName>geronimo-service.xml</planFileName>
+                    <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/servicemix-service/${pom.version}/servicemix-service-${pom.version}.jar</moduleFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,4 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<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>
 
@@ -12,7 +33,7 @@
     <artifactId>servicemix</artifactId>
     <packaging>pom</packaging>
     <name>ServiceMix</name>
-    <version>3.0.2-incubating-SNAPSHOT</version>
+    <version>3.0.1-incubating-SNAPSHOT</version>
     <description>
     ServiceMix is an open source ESB based on the Java Business
     Integration framework - JSR-208 
@@ -1571,4 +1592,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/basic/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/basic/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/basic/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,11 +1,33 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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</groupId>
         <artifactId>samples</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
+        <version>3.0.1-incubating-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.samples</groupId>
@@ -114,4 +136,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-eip-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-eip-su/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-eip-su/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-eip-su/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,33 +1,55 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples.bridge</groupId>
-    <artifactId>bridge-eip-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: EIP</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-eip</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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>bridge</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.bridge</groupId>
+    <artifactId>bridge-eip-su</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <name>ServiceMix :: Samples :: Bridge :: EIP</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-eip</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-http-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-http-su/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-http-su/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-http-su/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,33 +1,54 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples.bridge</groupId>
-    <artifactId>bridge-http-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: HTTP</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<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>bridge</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.bridge</groupId>
+    <artifactId>bridge-http-su</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <name>ServiceMix :: Samples :: Bridge :: HTTP</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-http</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-jms-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-jms-su/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-jms-su/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-jms-su/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,33 +1,55 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples.bridge</groupId>
-    <artifactId>bridge-jms-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: JMS</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jms</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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>bridge</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.bridge</groupId>
+    <artifactId>bridge-jms-su</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <name>ServiceMix :: Samples :: Bridge :: JMS</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-jms</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-sa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-sa/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-sa/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-sa/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,48 +1,70 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples.bridge</groupId>
-    <artifactId>bridge-sa</artifactId>
-    <packaging>jbi-service-assembly</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: SA</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.samples.bridge</groupId>
-            <artifactId>bridge-http-su</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.samples.bridge</groupId>
-            <artifactId>bridge-eip-su</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.samples.bridge</groupId>
-            <artifactId>bridge-xslt-su</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.samples.bridge</groupId>
-            <artifactId>bridge-jms-su</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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>bridge</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.bridge</groupId>
+    <artifactId>bridge-sa</artifactId>
+    <packaging>jbi-service-assembly</packaging>
+    <name>ServiceMix :: Samples :: Bridge :: SA</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix.samples.bridge</groupId>
+            <artifactId>bridge-http-su</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.samples.bridge</groupId>
+            <artifactId>bridge-eip-su</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.samples.bridge</groupId>
+            <artifactId>bridge-xslt-su</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.samples.bridge</groupId>
+            <artifactId>bridge-jms-su</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-xslt-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-xslt-su/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-xslt-su/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/bridge-xslt-su/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,38 +1,60 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.samples</groupId>
-        <artifactId>bridge</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples.bridge</groupId>
-    <artifactId>bridge-xslt-su</artifactId>
-    <packaging>jbi-service-unit</packaging>
-    <name>ServiceMix :: Samples :: Bridge :: XSLT</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-lwcontainer</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-components</artifactId>
-            <version>3.0.1-incubating-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.servicemix.tooling</groupId>
-                <artifactId>jbi-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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>bridge</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples.bridge</groupId>
+    <artifactId>bridge-xslt-su</artifactId>
+    <packaging>jbi-service-unit</packaging>
+    <name>ServiceMix :: Samples :: Bridge :: XSLT</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-lwcontainer</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-components</artifactId>
+            <version>3.0.1-incubating-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>jbi-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: incubator/servicemix/branches/servicemix-3.0/samples/bridge/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0/samples/bridge/pom.xml?view=diff&rev=469695&r1=469694&r2=469695
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0/samples/bridge/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0/samples/bridge/pom.xml Tue Oct 31 15:00:43 2006
@@ -1,98 +1,121 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix</groupId>
-        <artifactId>samples</artifactId>
-        <version>3.0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.samples</groupId>
-    <artifactId>bridge</artifactId>
-    <name>ServiceMix :: Samples :: Bridge</name>
-    <packaging>pom</packaging>
-    
-    <!-- Add ServiceMix repositories for snaphots and releases -->
-    <pluginRepositories>
-      <pluginRepository>
-        <id>apache.snapshots</id>
-        <name>Apache Snapshots Repository</name>
-        <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        <snapshots>
-          <enabled>true</enabled>
-        </snapshots>
-        <releases>
-           <enabled>false</enabled>
-        </releases>
-      </pluginRepository>
-      <pluginRepository>
-        <id>apache</id>
-        <name>Apache Incubating Repository</name>
-        <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-        <releases>
-           <enabled>true</enabled>
-        </releases>
-      </pluginRepository>
-    </pluginRepositories>
-    <repositories>
-      <repository>
-        <id>apache.snapshots</id>
-        <name>Apache Snapshots Repository</name>
-        <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        <snapshots>
-          <enabled>true</enabled>
-        </snapshots>
-        <releases>
-           <enabled>false</enabled>
-        </releases>
-      </repository>
-      <repository>
-        <id>apache.snapshots</id>
-        <name>Apache Incubating Repository</name>
-        <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-        <releases>
-           <enabled>true</enabled>
-        </releases>
-      </repository>
-    </repositories>
-
-    <modules>
-      <module>bridge-http-su</module>
-      <module>bridge-eip-su</module>
-      <module>bridge-xslt-su</module>
-      <module>bridge-jms-su</module>
-      <module>bridge-sa</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/src.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+
+-->
+<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</groupId>
+        <artifactId>samples</artifactId>
+        <version>3.0.1-incubating-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.samples</groupId>
+    <artifactId>bridge</artifactId>
+    <name>ServiceMix :: Samples :: Bridge</name>
+    <packaging>pom</packaging>
+    
+    <!-- Add ServiceMix repositories for snaphots and releases -->
+    <pluginRepositories>
+      <pluginRepository>
+        <id>apache.snapshots</id>
+        <name>Apache Snapshots Repository</name>
+        <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+        <releases>
+           <enabled>false</enabled>
+        </releases>
+      </pluginRepository>
+      <pluginRepository>
+        <id>apache</id>
+        <name>Apache Incubating Repository</name>
+        <url>http://people.apache.org/repo/m2-incubating-repository</url>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+        <releases>
+           <enabled>true</enabled>
+        </releases>
+      </pluginRepository>
+    </pluginRepositories>
+    <repositories>
+      <repository>
+        <id>apache.snapshots</id>
+        <name>Apache Snapshots Repository</name>
+        <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+        <releases>
+           <enabled>false</enabled>
+        </releases>
+      </repository>
+      <repository>
+        <id>apache.snapshots</id>
+        <name>Apache Incubating Repository</name>
+        <url>http://people.apache.org/repo/m2-incubating-repository</url>
+        <snapshots>
+          <enabled>false</enabled>
+        </snapshots>
+        <releases>
+           <enabled>true</enabled>
+        </releases>
+      </repository>
+    </repositories>
+
+    <modules>
+      <module>bridge-http-su</module>
+      <module>bridge-eip-su</module>
+      <module>bridge-xslt-su</module>
+      <module>bridge-jms-su</module>
+      <module>bridge-sa</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+