You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/09/16 17:16:31 UTC

svn commit: r997782 - in /tuscany/maven/org/apache/tuscany: ./ sca/ sca/oasis-assembly-contributions/ sca/oasis-assembly-contributions/2.0-SNAPSHOT/ sca/tuscany-otests-asm-tests/ sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/

Author: slaws
Date: Thu Sep 16 15:16:30 2010
New Revision: 997782

URL: http://svn.apache.org/viewvc?rev=997782&view=rev
Log:
move the temporary OASIS otest data from ant's p.a.o directory to somewhere the any Tuscany committer can edit. These could be out in the real snapshot repo I guess but I can't publish there atm and I want to make sure we can get rid of this when OASIS publish them properly. 

Added:
    tuscany/maven/org/apache/tuscany/
    tuscany/maven/org/apache/tuscany/sca/
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/maven-metadata-local.xml
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.pom
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip   (with props)
    tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/maven-metadata-local.xml
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/maven-metadata-local.xml
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar   (with props)
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom
    tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/maven-metadata-local.xml

Added: tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/maven-metadata-local.xml?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/maven-metadata-local.xml (added)
+++ tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/maven-metadata-local.xml Thu Sep 16 15:16:30 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.tuscany.sca</groupId>
+  <artifactId>oasis-assembly-contributions</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20100915163817</lastUpdated>
+  </versioning>
+</metadata>

Added: tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.pom?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.pom (added)
+++ tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.pom Thu Sep 16 15:16:30 2010
@@ -0,0 +1,54 @@
+<?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-sca</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>oasis-assembly-contributions</artifactId>
+    <name>Apache Tuscany SCA OASIS Assembly Otest Contributions Zip</name>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.2-beta-5</version>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/resources/assembly.xml</descriptor>
+              </descriptors>
+            </configuration>
+            <executions>
+              <execution>
+                <id>make-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+    </build>
+</project>

Added: tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip?rev=997782&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/2.0-SNAPSHOT/oasis-assembly-contributions-2.0-SNAPSHOT.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/maven-metadata-local.xml?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/maven-metadata-local.xml (added)
+++ tuscany/maven/org/apache/tuscany/sca/oasis-assembly-contributions/maven-metadata-local.xml Thu Sep 16 15:16:30 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.tuscany.sca</groupId>
+  <artifactId>oasis-assembly-contributions</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <versioning>
+    <versions>
+      <version>2.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20100915163817</lastUpdated>
+  </versioning>
+</metadata>

Added: tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/maven-metadata-local.xml?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/maven-metadata-local.xml (added)
+++ tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/maven-metadata-local.xml Thu Sep 16 15:16:30 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.tuscany.sca</groupId>
+  <artifactId>tuscany-otests-asm-tests</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20100916122023</lastUpdated>
+  </versioning>
+</metadata>

Added: tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar?rev=997782&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom (added)
+++ tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/2.0-SNAPSHOT/tuscany-otests-asm-tests-2.0-SNAPSHOT.pom Thu Sep 16 15:16:30 2010
@@ -0,0 +1,239 @@
+<?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-sca</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-otests-asm-tests</artifactId>
+    <name>Apache Tuscany SCA Specification Assembly Tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-deployment</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl-osgi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency> 
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.oasis-open.sca.assembly</groupId>
+            <artifactId>General_Java</artifactId>
+            <version>1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+<!-- for when OASIS deploy the artifacts themselves
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
+                <execution>
+                   <id>copy</id>
+                   <phase>compile</phase>
+                   <goals>
+                      <goal>copy</goal>
+                   </goals>
+                   <configuration>
+                     <artifactItems>
+                       <artifactItem>
+		          <groupId>org.oasis-open.sca.assembly</groupId>
+		          <artifactId>ASM_4002</artifactId>
+                          <type>zip</type>
+		          <version>1.0</version>
+                       </artifactItem>
+                     </artifactItems>
+                     <stripVersion>true</stripVersion>
+                   </configuration>
+                </execution>
+                <execution>
+                  <id>unpack</id>
+                  <phase>test-compile</phase>
+                  <goals>
+                    <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                     <artifactItems>
+                       <artifactItem>
+                         <groupId>org.oasis-open.sca.assembly</groupId>
+                         <artifactId>Test_Client</artifactId>
+                         <version>1.0</version>
+                         <type>jar</type>
+                         <outputDirectory>${project.build.directory}/dependency/Test_client</outputDirectory>
+                       </artifactItem>
+                     </artifactItems>
+                  </configuration>
+                </execution>
+             </executions>
+          </plugin>
+-->
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>copy-files-from-svn</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>                              
+                                <ant antfile="../build.xml">
+                                    <property name="from.dir" value="../sca-assembly/Test_Client/src/main/resources"/>
+                                    <property name="to.dir" value="src/main/resources"/>
+                                    <target name="copyResourceDir"/>
+                                </ant>
+                                <ant antfile="../build.xml">
+                                    <property name="from.dir" value="../sca-assembly/Test_Client/src/main/java"/>
+                                    <property name="to.dir" value="src/test/java"/>
+                                    <target name="copySourceDir"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+                        
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/tjava</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>add-test-resource</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-resource</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                   <directory>src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                  <classesDirectory>${project.build.directory}/test-classes</classesDirectory>
+                  <includes>
+                    <include>**/*</include>
+                  </includes>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

Added: tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/maven-metadata-local.xml
URL: http://svn.apache.org/viewvc/tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/maven-metadata-local.xml?rev=997782&view=auto
==============================================================================
--- tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/maven-metadata-local.xml (added)
+++ tuscany/maven/org/apache/tuscany/sca/tuscany-otests-asm-tests/maven-metadata-local.xml Thu Sep 16 15:16:30 2010
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.tuscany.sca</groupId>
+  <artifactId>tuscany-otests-asm-tests</artifactId>
+  <version>2.0-SNAPSHOT</version>
+  <versioning>
+    <versions>
+      <version>2.0-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20100916122023</lastUpdated>
+  </versioning>
+</metadata>