Renamed datatorrent variables to apex and removed DataTorrent information from apc archetype
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/bf8d3eda Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/bf8d3eda Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/bf8d3eda Branch: refs/heads/devel-3 Commit: bf8d3edaa9a2d5b5d71af4357f9316117b7545dd Parents: 0710f92 Author: David Yan <[email protected]> Authored: Thu Nov 19 16:30:04 2015 -0800 Committer: David Yan <[email protected]> Committed: Thu Nov 19 16:33:11 2015 -0800 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 6 +-- .../main/resources/archetype-resources/pom.xml | 46 +++++--------------- .../resources/testAppPackage/mydtapp/pom.xml | 12 ++--- 3 files changed, 19 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/apex-app-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml index 764edc0..74f320c 100644 --- a/apex-app-archetype/src/main/resources/archetype-resources/pom.xml +++ b/apex-app-archetype/src/main/resources/archetype-resources/pom.xml @@ -12,9 +12,9 @@ <description>My Apex Application Description</description> <properties> - <!-- change this if you desire to use a different version of DataTorrent --> + <!-- change this if you desire to use a different version of Apex Core --> <apex.version>${archetypeVersion}</apex.version> - <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath> + <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath> </properties> <build> @@ -78,7 +78,7 @@ </archiverConfig> <archive> <manifestEntries> - <Class-Path>${datatorrent.apppackage.classpath}</Class-Path> + <Class-Path>${apex.apppackage.classpath}</Class-Path> <DT-Engine-Version>${apex.version}</DT-Engine-Version> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml index ace6f59..42ec2bf 100644 --- a/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml +++ b/apex-conf-archetype/src/main/resources/archetype-resources/pom.xml @@ -18,40 +18,14 @@ </license> </licenses> - <scm> - <connection>scm:git:[email protected]:DataTorrent/Apex.git</connection> - <developerConnection>scm:git:[email protected]:DataTorrent/Apex.git</developerConnection> - <url>[email protected]:DataTorrent/Apex.git</url> - </scm> - <properties> - <datatorrent.apppackage.name>myapexapp</datatorrent.apppackage.name> - <datatorrent.apppackage.minversion>1.0.0</datatorrent.apppackage.minversion> - <datatorrent.apppackage.maxversion>1.9999.9999</datatorrent.apppackage.maxversion> - <datatorrent.appconf.classpath>classpath/*</datatorrent.appconf.classpath> - <datatorrent.appconf.files>files/*</datatorrent.appconf.files> + <apex.apppackage.name>myapexapp</apex.apppackage.name> + <apex.apppackage.minversion>1.0.0</apex.apppackage.minversion> + <apex.apppackage.maxversion>1.9999.9999</apex.apppackage.maxversion> + <apex.appconf.classpath>classpath/*</apex.appconf.classpath> + <apex.appconf.files>files/*</apex.appconf.files> </properties> - <!-- repository to provide the DataTorrent artifacts --> - <repositories> - <repository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>Datatorrent-Releases</id> - <name>DataTorrent Release Repository</name> - <url>https://www.datatorrent.com/maven/content/repositories/releases/</url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <id>DataTorrent-Snapshots</id> - <name>DataTorrent Early Access Program Snapshot Repository</name> - <url>https://www.datatorrent.com/maven/content/repositories/snapshots/</url> - </repository> - </repositories> - <build> <plugins> <plugin> @@ -132,14 +106,14 @@ </archiverConfig> <archive> <manifestEntries> - <DT-App-Package-Name>${datatorrent.apppackage.name}</DT-App-Package-Name> - <DT-App-Package-Min-Version>${datatorrent.apppackage.minversion}</DT-App-Package-Min-Version> - <DT-App-Package-Max-Version>${datatorrent.apppackage.maxversion}</DT-App-Package-Max-Version> + <DT-App-Package-Name>${apex.apppackage.name}</DT-App-Package-Name> + <DT-App-Package-Min-Version>${apex.apppackage.minversion}</DT-App-Package-Min-Version> + <DT-App-Package-Max-Version>${apex.apppackage.maxversion}</DT-App-Package-Max-Version> <DT-Conf-Package-Name>${project.artifactId}</DT-Conf-Package-Name> <DT-Conf-Package-Display-Name>${project.name}</DT-Conf-Package-Display-Name> <DT-Conf-Package-Description>${project.description}</DT-Conf-Package-Description> - <Class-Path>${datatorrent.appconf.classpath}</Class-Path> - <Files>${datatorrent.appconf.files}</Files> + <Class-Path>${apex.appconf.classpath}</Class-Path> + <Files>${apex.appconf.files}</Files> </manifestEntries> </archive> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/bf8d3eda/engine/src/test/resources/testAppPackage/mydtapp/pom.xml ---------------------------------------------------------------------- diff --git a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml index d1efa48..9d2ea7d 100644 --- a/engine/src/test/resources/testAppPackage/mydtapp/pom.xml +++ b/engine/src/test/resources/testAppPackage/mydtapp/pom.xml @@ -32,9 +32,9 @@ <description>My Apex Application Description</description> <properties> - <!-- change this if you desire to use a different version of DataTorrent --> - <datatorrent.version>3.2.0-incubating</datatorrent.version> - <datatorrent.apppackage.classpath>lib/*.jar</datatorrent.apppackage.classpath> + <!-- change this if you desire to use a different version of Apex Core --> + <apex.version>3.2.0-incubating</apex.version> + <apex.apppackage.classpath>lib/*.jar</apex.apppackage.classpath> </properties> <build> @@ -117,8 +117,8 @@ </archiverConfig> <archive> <manifestEntries> - <Class-Path>${datatorrent.apppackage.classpath}</Class-Path> - <DT-Engine-Version>${datatorrent.version}</DT-Engine-Version> + <Class-Path>${apex.apppackage.classpath}</Class-Path> + <DT-Engine-Version>${apex.version}</DT-Engine-Version> <DT-App-Package-Name>${project.artifactId}</DT-App-Package-Name> <DT-App-Package-Version>${project.version}</DT-App-Package-Version> <DT-App-Package-Display-Name>${project.name}</DT-App-Package-Display-Name> @@ -166,7 +166,7 @@ <dependency> <groupId>org.apache.apex</groupId> <artifactId>apex-common</artifactId> - <version>${datatorrent.version}</version> + <version>${apex.version}</version> <scope>provided</scope> </dependency> <dependency>
