Author: jboynes
Date: Wed Oct 4 16:34:02 2006
New Revision: 453064
URL: http://svn.apache.org/viewvc?view=rev&rev=453064
Log:
move distribution/das under das
Added:
incubator/tuscany/java/das/distribution/
incubator/tuscany/java/das/distribution/binary/
- copied from r453049, incubator/tuscany/java/distribution/das/
incubator/tuscany/java/das/distribution/samples/
- copied from r453049, incubator/tuscany/java/distribution/das-samples/
Removed:
incubator/tuscany/java/distribution/das/
incubator/tuscany/java/distribution/das-samples/
Modified:
incubator/tuscany/java/das/distribution/binary/pom.xml
incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
incubator/tuscany/java/das/distribution/samples/pom.xml
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
incubator/tuscany/java/das/pom.xml
Modified: incubator/tuscany/java/das/distribution/binary/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/pom.xml?view=diff&rev=453064&r1=453049&r2=453064
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/pom.xml (original)
+++ incubator/tuscany/java/das/distribution/binary/pom.xml Wed Oct 4 16:34:02
2006
@@ -20,12 +20,11 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.distribution</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<artifactId>das</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tuscany DAS Distribution</name>
<description>Tuscany Distribution for DAS.</description>
@@ -34,32 +33,6 @@
<sdo.version>1.0-incubator-M2-SNAPSHOT</sdo.version>
</properties>
- <!-- definition of repositories where the parent pom can be found -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache.incubator</id>
- <name>Apache Incubator Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.tuscany.das</groupId>
Modified:
incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml?view=diff&rev=453064&r1=453049&r2=453064
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
(original)
+++ incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
Wed Oct 4 16:34:02 2006
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors,
as applicable.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+--><assembly>
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
Modified: incubator/tuscany/java/das/distribution/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/samples/pom.xml?view=diff&rev=453064&r1=453049&r2=453064
==============================================================================
--- incubator/tuscany/java/das/distribution/samples/pom.xml (original)
+++ incubator/tuscany/java/das/distribution/samples/pom.xml Wed Oct 4 16:34:02
2006
@@ -20,19 +20,18 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.distribution</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.apache.tuscany.das</groupId>
+ <artifactId>tuscany-das</artifactId>
<version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<artifactId>das-samples</artifactId>
- <version>1.0-incubator-M2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Tuscany DAS Distribution</name>
- <description>Tuscany Distribution for DAS.</description>
+ <name>Tuscany DAS Samples Distribution</name>
+ <description>Tuscany Distribution for DAS Samples.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.samples.das</groupId>
+ <groupId>org.apache.tuscany.das.samples</groupId>
<artifactId>sample-companyweb</artifactId>
<version>${pom.version}</version>
<type>war</type>
Modified:
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml?view=diff&rev=453064&r1=453049&r2=453064
==============================================================================
---
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
(original)
+++
incubator/tuscany/java/das/distribution/samples/src/main/assembly/das-samples.xml
Wed Oct 4 16:34:02 2006
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors,
as applicable.
+ * 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
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
- -->
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
<assembly>
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
@@ -50,7 +53,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<includes>
-
<include>org.apache.tuscany.samples.das:sample-companyweb</include>
+
<include>org.apache.tuscany.das.samples:sample-companyweb</include>
</includes>
<fileMode>644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/das/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/pom.xml?view=diff&rev=453064&r1=453063&r2=453064
==============================================================================
--- incubator/tuscany/java/das/pom.xml (original)
+++ incubator/tuscany/java/das/pom.xml Wed Oct 4 16:34:02 2006
@@ -33,6 +33,8 @@
<modules>
<module>rdb</module>
<module>samples</module>
+ <module>distribution/binary</module>
+ <module>distribution/samples</module>
</modules>
<!-- definition of repositories where the parent pom can be found -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
