From d6805c279418adc2bbd41f93662839646021483f Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 21 Apr 2009 06:35:18 +0000
Subject: Move to 1.x-contrib

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@767004 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.x/distribution/tomcat/pom.xml  | 79 ----------------------
 .../distribution/tomcat/src/main/assembly/bin.xml  | 61 -----------------
 .../resources/sca-contributions/tuscany.properties | 19 ------
 3 files changed, 159 deletions(-)
 delete mode 100644 branches/sca-java-1.x/distribution/tomcat/pom.xml
 delete mode 100644 branches/sca-java-1.x/distribution/tomcat/src/main/assembly/bin.xml
 delete mode 100644 branches/sca-java-1.x/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties

(limited to 'branches')

diff --git a/branches/sca-java-1.x/distribution/tomcat/pom.xml b/branches/sca-java-1.x/distribution/tomcat/pom.xml
deleted file mode 100644
index 04a2317b5b..0000000000
--- a/branches/sca-java-1.x/distribution/tomcat/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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>1.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <name>Apache Tuscany SCA WebApp Runtime</name>
-    <artifactId>tuscany-tomcat-overlay</artifactId>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>tuscany-runtime-tomcat</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <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>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <finalName>apache-tuscany-tomcat-overlay-${pom.version}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.x/distribution/tomcat/src/main/assembly/bin.xml b/branches/sca-java-1.x/distribution/tomcat/src/main/assembly/bin.xml
deleted file mode 100644
index c66b086e27..0000000000
--- a/branches/sca-java-1.x/distribution/tomcat/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>bin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>dir</format>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Add the text files to the top-level directroy -->
-        <!-- commented out till we distribute fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet -->
-
-        <!-- Add the repository and properties file -->
-        <fileSet>
-            <directory>src/main/resources/sca-contributions</directory>
-            <outputDirectory>/sca-contributions</outputDirectory>
-            <includes>
-                <include>tuscany.properties</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <unpack>false</unpack>
-            <scope>runtime</scope>
-        </dependencySet>
-
-    </dependencySets>
-
-</assembly>
diff --git a/branches/sca-java-1.x/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties b/branches/sca-java-1.x/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
deleted file mode 100644
index 6e2ca20deb..0000000000
--- a/branches/sca-java-1.x/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-#    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.
-#
-#nodeName=http://localhost:8080/tuscany/
-#domainName=http://localhost:8877
-hotDeployInterval=10000
-- 
cgit v1.2.3