Modified: incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml (original) +++ incubator/tuscany/java/sca/databinding/databinding-xmlbeans/pom.xml Sat Sep 16 13:47:41 2006 @@ -18,13 +18,11 @@ * under the License. --> <project> - <parent> - <groupId>org.apache.tuscany.databinding</groupId> - <artifactId>databinding</artifactId> + <groupId>org.apache.tuscany.sca.services.databinding</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>databinding-xmlbeans</artifactId> <name>Apache Tuscany Data Binding for XmlBeans</name> @@ -32,7 +30,7 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.databinding</groupId> + <groupId>org.apache.tuscany.sca.services.databinding</groupId> <artifactId>databinding-framework</artifactId> <version>${pom.version}</version> <scope>compile</scope>
Modified: incubator/tuscany/java/sca/databinding/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/databinding/pom.xml (original) +++ incubator/tuscany/java/sca/databinding/pom.xml Sat Sep 16 13:47:41 2006 @@ -20,24 +20,24 @@ <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.services</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.databinding</groupId> - <artifactId>databinding</artifactId> + <groupId>org.apache.tuscany.sca.services.databinding</groupId> + <artifactId>parent</artifactId> <packaging>pom</packaging> <name>Tuscany SCA Data Bindings</name> <modules> + <module>databinding-framework</module> <module>databinding-axiom</module> <module>databinding-castor</module> - <module>databinding-framework</module> <module>databinding-jaxb</module> <module>databinding-sdo</module> - <module>databinding-test</module> <module>databinding-xmlbeans</module> + <module>databinding-test</module> </modules> </project> Added: incubator/tuscany/java/sca/idl/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/pom.xml?view=auto&rev=446951 ============================================================================== --- incubator/tuscany/java/sca/idl/pom.xml (added) +++ incubator/tuscany/java/sca/idl/pom.xml Sat Sep 16 13:47:41 2006 @@ -0,0 +1,61 @@ +<?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> + <parent> + <groupId>org.apache.tuscany.sca.services</groupId> + <artifactId>parent</artifactId> + <version>1.0-incubator-M2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.tuscany.sca.services.idl</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <name>Tuscany SCA Interface Definition Languages</name> + + <!-- 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> + + <modules> + <module>wsdl</module> + </modules> +</project> Propchange: incubator/tuscany/java/sca/idl/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/idl/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/tuscany/java/sca/idl/wsdl/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/idl/wsdl/pom.xml (original) +++ incubator/tuscany/java/sca/idl/wsdl/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,12 +19,11 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.services.idl</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.idl</groupId> <artifactId>wsdl</artifactId> <packaging>jar</packaging> <name>Apache Tuscany WSDL</name> @@ -37,25 +36,19 @@ <version>${sca.version}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.apache.ws.commons</groupId> + <artifactId>XmlSchema</artifactId> + </dependency> <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> - <version>1.5.2</version> - <scope>compile</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> <dependency> - <groupId>org.apache.ws.commons</groupId> - <artifactId>XmlSchema</artifactId> - <version>SNAPSHOT</version> - <scope>compile</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> Modified: incubator/tuscany/java/sca/kernel/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/kernel/pom.xml (original) +++ incubator/tuscany/java/sca/kernel/pom.xml Sat Sep 16 13:47:41 2006 @@ -20,9 +20,9 @@ <project> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>parent</artifactId> - <version>1-incubator-SNAPSHOT</version> + <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <groupId>org.apache.tuscany.sca.kernel</groupId> <artifactId>parent</artifactId> @@ -30,6 +30,32 @@ <name>Apache Tuscany SCA Kernel Sub-Project</name> <version>1.0-incubator-M2-SNAPSHOT</version> + <!-- 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> + <modules> <module>api</module> <module>host-api</module> @@ -37,160 +63,7 @@ <module>core</module> </modules> - <dependencyManagement> - <dependencies> - <!-- org.osoa.sca API --> - <dependency> - <groupId>org.osoa</groupId> - <artifactId>sca-api-r0.95</artifactId> - <version>1.0-incubator-M2-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <!-- javax.servlet API --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <!-- javax.resource API --> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <!-- javax.transaction API --> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.0.1B_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <!-- CommonJ Timer/Work API --> - <dependency> - <groupId>org.apache.tuscany</groupId> - <artifactId>commonj-api_r1.1</artifactId> - <version>1.0-incubator-M2-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <!-- java.xml.stream API --> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - <scope>compile</scope> - </dependency> - <!-- StAX implementation --> - <dependency> - <groupId>woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>2.9.3</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>2.2</version> - <scope>test</scope> - </dependency> - </dependencies> - </dependencyManagement> - <build> <defaultGoal>install</defaultGoal> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.tuscany</groupId> - <artifactId>buildtools</artifactId> - <version>1.0-incubator-M2-SNAPSHOT</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>process-sources</id> - <phase>process-sources</phase> - <configuration> - <configLocation>tuscany-checkstyle.xml</configLocation> - <suppressionsLocation>tuscany-suppressions.xml</suppressionsLocation> - <consoleOutput>true</consoleOutput> - <failsOnError>true</failsOnError> - <linkXRef>false</linkXRef> - <sourceDirectory>${basedir}/src</sourceDirectory> - <propertyExpansion>${checkstyle.properties}</propertyExpansion> - </configuration> - <goals> - <goal>checkstyle</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <rulesets> - <ruleset>${basedir}/.ruleset</ruleset> - </rulesets> - <linkXRef>false</linkXRef> - <targetJdk>1.5</targetJdk> - </configuration> - <executions> - <execution> - <id>process-sources</id> - <phase>process-sources</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.2</version> - <configuration> - <includes> - <include>**/*TestCase.java</include> - </includes> - <reportFormat>brief</reportFormat> - <useFile>false</useFile> - <forkMode>once</forkMode> - <argLine>-ea</argLine> - </configuration> - </plugin> - - </plugins> - </pluginManagement> </build> </project> Modified: incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml (original) +++ incubator/tuscany/java/sca/plugins/plugin.java2wsdl/pom.xml Sat Sep 16 13:47:41 2006 @@ -1,23 +1,26 @@ <?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. +--> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>tuscany-sca-plugins</artifactId> + <groupId>org.apache.tuscany.sca.plugins</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> @@ -34,23 +37,10 @@ <version>2.0</version> </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>sca-tools</artifactId> <version>${pom.version}</version> <scope>compile</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: incubator/tuscany/java/sca/plugins/plugin.war/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.war/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/plugins/plugin.war/pom.xml (original) +++ incubator/tuscany/java/sca/plugins/plugin.war/pom.xml Sat Sep 16 13:47:41 2006 @@ -1,10 +1,31 @@ +<?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> - + <parent> + <groupId>org.apache.tuscany.sca.plugins</groupId> + <artifactId>parent</artifactId> + <version>1.0-incubator-M2-SNAPSHOT</version> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany</groupId> <artifactId>tuscany-war-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>1.0-incubator-M2-SNAPSHOT</version> <name>Tuscany War Plugin</name> <dependencies> @@ -24,18 +45,4 @@ <version>1.2</version> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - </project> Modified: incubator/tuscany/java/sca/plugins/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/plugins/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java (original) +++ incubator/tuscany/java/sca/plugins/plugin.war/src/main/java/org/apache/tuscany/plugin/war/Dependency.java Sat Sep 16 13:47:41 2006 @@ -113,7 +113,7 @@ private static class WebappHostDependency extends Dependency { // TODO Decide on whether to get snapshot version rather than hardcoded version private WebappHostDependency() { - super("org.apache.tuscany.runtime", "webapp-host", "1.0-incubator-M2-SNAPSHOT"); + super("org.apache.tuscany.sca.runtime", "webapp-host", "1.0-incubator-M2-SNAPSHOT"); } } Modified: incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml (original) +++ incubator/tuscany/java/sca/plugins/plugin.wsdl2java/pom.xml Sat Sep 16 13:47:41 2006 @@ -1,23 +1,26 @@ <?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. +--> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>tuscany-sca-plugins</artifactId> + <groupId>org.apache.tuscany.sca.plugins</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> @@ -34,23 +37,10 @@ <version>2.0</version> </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>sca-tools</artifactId> <version>${pom.version}</version> <scope>compile</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: incubator/tuscany/java/sca/plugins/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/plugins/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/plugins/pom.xml (original) +++ incubator/tuscany/java/sca/plugins/pom.xml Sat Sep 16 13:47:41 2006 @@ -1,30 +1,60 @@ <?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. +--> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>tuscany-sca-plugins</artifactId> + <groupId>org.apache.tuscany.sca.plugins</groupId> + <artifactId>parent</artifactId> <packaging>pom</packaging> <name>Tuscany SCA Maven Plugins</name> + + <!-- 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> <modules> <module>plugin.war</module> Modified: incubator/tuscany/java/sca/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/pom.xml (original) +++ incubator/tuscany/java/sca/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,8 +19,13 @@ --> <project> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <parent> + <groupId>org.apache.tuscany</groupId> + <artifactId>parent</artifactId> + <version>1-incubator-SNAPSHOT</version> + </parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> <packaging>pom</packaging> <name>Tuscany SCA Implementation Project</name> <version>1.0-incubator-M2-SNAPSHOT</version> @@ -29,18 +34,40 @@ <scaKernelVersion>1.0-incubator-M2-SNAPSHOT</scaKernelVersion> <notice.dir>.</notice.dir> <axis2Version>SNAPSHOT</axis2Version> - <axiomVersion>SNAPSHOT</axiomVersion> </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> + <modules> + <module>kernel</module> <module>test</module> - <module>containers</module> - <module>idl/wsdl</module> - <module>databinding</module> - <module>bindings</module> - <module>runtime/webapp</module> - <module>runtime/webapp-host</module> - <module>commands/launcher</module> + <module>services</module> + <module>runtime</module> + <module>commands</module> <module>tools</module> <module>plugins</module> </modules> @@ -85,10 +112,17 @@ </dependency> <!-- commonj.work and commonj.timer APIs --> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-commonj_1.1_spec</artifactId> - <version>1.0.1-SNAPSHOT</version> - <scope>provided</scope> + <groupId>org.apache.tuscany</groupId> + <artifactId>commonj-api_r1.1</artifactId> + <version>1.0-incubator-M2-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <!-- java.xml.stream API --> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + <scope>compile</scope> </dependency> <!-- StAX implementation --> @@ -111,13 +145,13 @@ <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>axiom-api</artifactId> - <version>${axiomVersion}</version> + <version>SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>axiom-impl</artifactId> - <version>${axiomVersion}</version> + <version>SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -150,7 +184,6 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> @@ -166,77 +199,6 @@ </dependencies> </dependencyManagement> - <inceptionYear>2005</inceptionYear> - <organization> - <name>Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - <url>http://incubator.apache.org/tuscany</url> - - <prerequisites> - <maven>2.0.4</maven> - </prerequisites> - - <issueManagement> - <system>jira</system> - <url>http://issues.apache.org/jira/browse/TUSCANY</url> - </issueManagement> - - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <repositories> - <!-- needed for Apache webServices artifacts --> - <repository> - <id>apache.m1</id> - <name>Apache Maven 1 Repository</name> - <url>http://people.apache.org/repository</url> - <layout>legacy</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>apache-snapshot-repository</id> - <name>Apache SNAPSHOT Repository</name> - <url>http://people.apache.org/repo/m2-snapshot-repository</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - - <!-- used for Plexus plugins --> - <pluginRepository> - <id>codehaus-snapshot</id> - <name>Codehaus Snapshot Repository</name> - <url>http://snapshots.repository.codehaus.org</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - - <distributionManagement> - <repository> - <id>apache.incubator</id> - <name>Apache Incubator Repository</name> - <url>scp://people.apache.org/www/people.apache.org/repo/m2-incubating-repository</url> - </repository> - <snapshotRepository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url> - </snapshotRepository> - </distributionManagement> - <build> <defaultGoal>install</defaultGoal> @@ -317,122 +279,20 @@ </configuration> </plugin> + <plugin> + <groupId>org.apache.felix.plugins</groupId> + <artifactId>maven-osgi-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <osgiManifest> + <bundleName>${pom.name}</bundleName> + <bundleDescription>${pom.description}</bundleDescription> + <bundleVendor>${pom.organization.name}</bundleVendor> + <bundleLocalization>plugin</bundleLocalization> + </osgiManifest> + </configuration> + </plugin> </plugins> </pluginManagement> - - <plugins> - <plugin> - <groupId>org.apache.felix.plugins</groupId> - <artifactId>maven-osgi-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <osgiManifest> - <bundleName>${pom.name}</bundleName> - <bundleDescription>${pom.description}</bundleDescription> - <bundleVendor>${pom.organization.name}</bundleVendor> - <bundleLocalization>plugin</bundleLocalization> - </osgiManifest> - </configuration> - </plugin> - </plugins> - - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.componentType</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${notice.dir}</directory> - <targetPath>META-INF</targetPath> - <filtering>true</filtering> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> - </resource> - </resources> - - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.componentType</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - - <extensions> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0-alpha-5</version> - </extension> - </extensions> </build> - - - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany/java</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany/java</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/incubator/tuscany/java</url> - </scm> - - - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <profiles> - <profile> - <!-- this is kind of a hack for eclipse. Eclipse doesn't like "." as a resource directory as then you have - source directories inside a source directory which causes all kinds of errors. We'll just point - the resources directory back to the resources directory. The NOTICE and LICSENSE files - won't be included in the eclipse builds, but it at least works. - --> - <id>eclipse</id> - <properties> - <notice.dir>src/main/resources</notice.dir> - </properties> - </profile> - <profile> - <id>sourcecheck</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <showDeprecation>true</showDeprecation> - <compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally</compilerArgument> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: incubator/tuscany/java/sca/runtime/equinox/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/equinox/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/runtime/equinox/pom.xml (original) +++ incubator/tuscany/java/sca/runtime/equinox/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,12 +19,11 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.runtime</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.runtime</groupId> <artifactId>equinox</artifactId> <packaging>jar</packaging> <name>Tuscany Equinox Runtime</name> @@ -44,7 +43,7 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>test</artifactId> <version>${sca.version}</version> <scope>test</scope> @@ -52,14 +51,10 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymockclassextension</artifactId> - <version>2.2</version> - <scope>test</scope> </dependency> </dependencies> Modified: incubator/tuscany/java/sca/runtime/osgi/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/osgi/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/runtime/osgi/pom.xml (original) +++ incubator/tuscany/java/sca/runtime/osgi/pom.xml Sat Sep 16 13:47:41 2006 @@ -21,12 +21,11 @@ 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";> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.runtime</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.runtime</groupId> <artifactId>tuscany-osgi</artifactId> <packaging>osgi-bundle</packaging> <name>Apache Tuscany OSGi Runtime</name> @@ -36,7 +35,7 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca.kernel</groupId> <artifactId>core</artifactId> <version>${sca.version}</version> <scope>compile</scope> @@ -48,7 +47,7 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>test</artifactId> <version>${sca.version}</version> <scope>test</scope> @@ -61,8 +60,6 @@ <dependency> <groupId>org.easymock</groupId> <artifactId>easymockclassextension</artifactId> - <version>2.2</version> - <scope>test</scope> </dependency> </dependencies> <build> Added: incubator/tuscany/java/sca/runtime/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/pom.xml?view=auto&rev=446951 ============================================================================== --- incubator/tuscany/java/sca/runtime/pom.xml (added) +++ incubator/tuscany/java/sca/runtime/pom.xml Sat Sep 16 13:47:41 2006 @@ -0,0 +1,39 @@ +<?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> + + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> + <version>1.0-incubator-M2-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.tuscany.sca.runtime</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <name>Tuscany SCA Runtime Hosts</name> + + <modules> + <module>webapp</module> + <module>webapp-host</module> + </modules> + +</project> Propchange: incubator/tuscany/java/sca/runtime/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/runtime/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/tuscany/java/sca/runtime/webapp-host/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/runtime/webapp-host/pom.xml (original) +++ incubator/tuscany/java/sca/runtime/webapp-host/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,12 +19,11 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.runtime</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.runtime</groupId> <artifactId>webapp-host</artifactId> <packaging>jar</packaging> <name>Apache Tuscany Web Application Host</name> @@ -42,7 +41,7 @@ </dependency> <dependency> - <groupId>org.apache.tuscany.runtime</groupId> + <groupId>org.apache.tuscany.sca.runtime</groupId> <artifactId>webapp</artifactId> <version>${sca.version}</version> <scope>compile</scope> @@ -55,7 +54,7 @@ </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>test</artifactId> <version>${sca.version}</version> <scope>test</scope> Modified: incubator/tuscany/java/sca/runtime/webapp/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/runtime/webapp/pom.xml (original) +++ incubator/tuscany/java/sca/runtime/webapp/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,12 +19,11 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca.runtime</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.runtime</groupId> <artifactId>webapp</artifactId> <packaging>jar</packaging> <name>Apache Tuscany Web Application Runtime</name> @@ -52,7 +51,7 @@ </dependency> <dependency> - <groupId>org.apache.tuscany</groupId> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>test</artifactId> <version>${sca.version}</version> <scope>test</scope> Modified: incubator/tuscany/java/sca/services/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/services/pom.xml (original) +++ incubator/tuscany/java/sca/services/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,17 +19,49 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.tuscany.services</groupId> - <artifactId>services</artifactId> + <groupId>org.apache.tuscany.sca.services</groupId> + <artifactId>parent</artifactId> <packaging>pom</packaging> <name>Tuscany SCA Services</name> + <!-- 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> + <modules> + <module>../idl</module> + <module>../containers</module> + <module>../databinding</module> + <module>../bindings</module> +<!-- <module>transports/http.jetty</module> +--> </modules> </project> Modified: incubator/tuscany/java/sca/test/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/test/pom.xml (original) +++ incubator/tuscany/java/sca/test/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,8 +19,8 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: incubator/tuscany/java/sca/tools/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tools/pom.xml?view=diff&rev=446951&r1=446950&r2=446951 ============================================================================== --- incubator/tuscany/java/sca/tools/pom.xml (original) +++ incubator/tuscany/java/sca/tools/pom.xml Sat Sep 16 13:47:41 2006 @@ -19,13 +19,13 @@ --> <project> <parent> - <groupId>org.apache.tuscany</groupId> - <artifactId>sca</artifactId> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>parent</artifactId> <version>1.0-incubator-M2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>sca-tools</artifactId> - <name>Tuscany SCA Tools</name> + <name>Apache Tuscany SCA Tools</name> <description>SCA Tools.</description> <repositories> @@ -50,14 +50,10 @@ <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> - <version>1.0.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> - <version>1.5.2</version> - <scope>compile</scope> </dependency> <dependency> @@ -75,13 +71,10 @@ <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>axiom-api</artifactId> - <version>SNAPSHOT</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>axiom-impl</artifactId> - <version>SNAPSHOT</version> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
