Fixes for TUSCANY-2690

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@720798 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 229 insertions, 230 deletions

diff --git a/branches/sca-java-1.x/distribution/features/webservice/pom.xml b/branches/sca-java-1.x/distribution/features/webservice/pom.xml
index 3edf5290b3..b334ab1418 100644
--- a/branches/sca-java-1.x/distribution/features/webservice/pom.xml
+++ b/branches/sca-java-1.x/distribution/features/webservice/pom.xml
@@ -1,230 +1,229 @@
-<?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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
-        <version>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Bindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant-nodeps</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>addressing</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-xmlbeans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.axis2</groupId>
-                    <artifactId>axis2-adb-codegen</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>opensaml</groupId>
-                    <artifactId>opensaml</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Databindings -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo-axiom</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Hosts -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Policy models -->
-        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-xml-ws</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-axis2-policy</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-impl</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-embedded</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?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>

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>org.apache.tuscany.sca</groupId>

+        <artifactId>tuscany-distribution-features</artifactId>

+        <version>1.4-SNAPSHOT</version>

+        <relativePath>../pom.xml</relativePath>

+    </parent>

+

+    <artifactId>tuscany-distribution-webservice</artifactId>

+    <name>Apache Tuscany SCA Web Service Distribution</name>

+    <packaging>pom</packaging>

+

+    <dependencies>

+

+        <!-- Core distribution -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-distribution-core</artifactId>

+            <type>pom</type>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Bindings -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-sca-axis2</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-binding-ws-axis2</artifactId>

+            <version>1.4-SNAPSHOT</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.ant</groupId>

+                    <artifactId>ant-nodeps</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>addressing</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>axis2-xmlbeans</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.apache.axis2</groupId>

+                    <artifactId>axis2-adb-codegen</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>bouncycastle</groupId>

+                    <artifactId>bcprov-jdk15</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>opensaml</groupId>

+                    <artifactId>opensaml</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+

+        <!-- Databindings -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-databinding-axiom</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-databinding-jaxb-axiom</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-databinding-sdo</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-databinding-sdo-axiom</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Hosts -->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-host-jetty</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+

+        <!-- Policy models -->

+        <!--dependency> NOW IN BINDING-WS-AXIS2-POLICY

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-policy-security-ws</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency-->

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-policy-xml-ws</artifactId>

+            <version>1.4-SNAPSHOT</version>

+        </dependency>

+    </dependencies>

+

+    <profiles>

+

+        <!-- Default build profile that can be used to build the distro packages -->

+        <profile>

+            <id>default</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <build>

+                <plugins>

+                    <plugin>

+                        <groupId>org.apache.maven.plugins</groupId>

+                        <artifactId>maven-assembly-plugin</artifactId>

+                        <executions>

+                            <execution>

+                                <id>distribution-package</id>

+                                <phase>package</phase>

+                                <goals>

+                                    <goal>single</goal>

+                                </goals>

+                                <configuration>

+                                    <descriptors>

+                                        <descriptor>src/main/assembly/bin.xml</descriptor>

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

+                                    </descriptors>

+                                    <tarLongFileMode>gnu</tarLongFileMode>

+                                    <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>

+                                </configuration>

+                            </execution>

+                        </executions>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+        

+        <!-- Profile that can be used to build the modules included in the distro -->

+        <profile>

+            <id>modules</id>

+            <modules>

+                <module>../../../modules/assembly</module>

+                <module>../../../modules/assembly-xml</module>

+                <module>../../../modules/assembly-xsd</module>

+                <module>../../../modules/binding-corba</module>

+                <module>../../../modules/binding-corba-runtime</module>

+                <module>../../../modules/binding-sca</module>

+                <module>../../../modules/binding-sca-axis2</module>

+                <module>../../../modules/binding-sca-xml</module>

+                <module>../../../modules/binding-ws</module>

+                <module>../../../modules/binding-ws-axis2</module>

+                <module>../../../modules/binding-ws-axis2-policy</module>

+                <module>../../../modules/binding-ws-wsdlgen</module>

+                <module>../../../modules/binding-ws-xml</module>

+                <module>../../../modules/contribution</module>

+                <module>../../../modules/contribution-impl</module>

+                <module>../../../modules/contribution-java</module>

+                <module>../../../modules/contribution-namespace</module>

+                <module>../../../modules/contribution-xml</module>

+                <module>../../../modules/core</module>

+                <module>../../../modules/core-databinding</module>

+                <module>../../../modules/core-spi</module>

+                <module>../../../modules/data-api</module>

+                <module>../../../modules/databinding</module>

+                <module>../../../modules/databinding-axiom</module>

+                <module>../../../modules/databinding-jaxb</module>

+                <module>../../../modules/databinding-jaxb-axiom</module>

+                <module>../../../modules/databinding-sdo</module>

+                <module>../../../modules/databinding-sdo-axiom</module>

+                <module>../../../modules/definitions</module>

+                <module>../../../modules/definitions-xml</module>

+                <module>../../../modules/endpoint</module>

+                <module>../../../modules/extensibility</module>

+                <module>../../../modules/extensibility-equinox</module>

+                <module>../../../modules/host-corba</module>

+                <module>../../../modules/host-corba-jse</module>

+                <module>../../../modules/host-embedded</module>

+                <module>../../../modules/host-http</module>

+                <module>../../../modules/host-jetty</module>

+                <module>../../../modules/implementation-java</module>

+                <module>../../../modules/implementation-java-runtime</module>

+                <module>../../../modules/implementation-java-xml</module>

+                <module>../../../modules/implementation-node</module>

+                <module>../../../modules/implementation-node-runtime</module>

+                <module>../../../modules/interface</module>

+                <module>../../../modules/interface-java</module>

+                <module>../../../modules/interface-java-jaxws</module>

+                <module>../../../modules/interface-java-xml</module>

+                <module>../../../modules/interface-wsdl</module>

+                <module>../../../modules/interface-wsdl-xml</module>

+                <module>../../../modules/monitor</module>

+                <module>../../../modules/node-api</module>

+                <module>../../../modules/node-impl</module>

+                <module>../../../modules/node-launcher</module>

+                <module>../../../modules/node-launcher-equinox</module>

+                <module>../../../modules/node-launcher-webapp</module>

+                <module>../../../modules/policy</module>

+                <module>../../../modules/policy-security</module>

+                <module>../../../modules/policy-security-ws</module>

+                <module>../../../modules/policy-xml</module>

+                <module>../../../modules/policy-xml-ws</module>

+                <module>../../../modules/sca-api</module>

+                <module>../../../modules/xsd</module>

+                <module>../../../modules/xsd-xml</module>

+            </modules>

+        </profile>

+    </profiles>

+

+</project>