You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/06 20:16:28 UTC
incubator-tinkerpop git commit: Reverted change that split
standalone/distribution executions in assembly plugin.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 791c13372 -> 1e18a92ef
Reverted change that split standalone/distribution executions in assembly plugin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1e18a92e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1e18a92e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1e18a92e
Branch: refs/heads/master
Commit: 1e18a92ef930083b338e07083458427bfb9be14f
Parents: 791c133
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 6 14:16:03 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 6 14:16:03 2015 -0400
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +++-----------
gremlin-console/src/assembly/distribution.xml | 31 ++++++++++--------
gremlin-server/pom.xml | 27 ++++-----------
gremlin-server/src/assembly/distribution.xml | 38 ++++++++++------------
4 files changed, 46 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1e18a92e/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index d66d128..6479b18 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -111,33 +111,18 @@ limitations under the License.
<version>2.4</version>
<executions>
<execution>
- <id>package-standalone</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <attach>false</attach>
- <descriptors>
- <descriptor>src/assembly/standalone.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>package-distribution</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>true</attach>
- <descriptors>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
<configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1e18a92e/gremlin-console/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/distribution.xml b/gremlin-console/src/assembly/distribution.xml
index ab89686..78d8603 100644
--- a/gremlin-console/src/assembly/distribution.xml
+++ b/gremlin-console/src/assembly/distribution.xml
@@ -21,33 +21,36 @@ limitations under the License.
</formats>
<fileSets>
<fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>0755</fileMode>
+ <fileMode>0775</fileMode>
+ <directory>target/${project.artifactId}-${project.version}-standalone/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ </includes>
</fileSet>
<fileSet>
<directory>conf</directory>
- <outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/main/ext</directory>
- <outputDirectory>/ext</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/data</directory>
+ <outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
- <directory>../data</directory>
- <outputDirectory>/data</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/docs</directory>
+ <outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../target/docs/htmlsingle</directory>
- <outputDirectory>/docs</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../target/site/apidocs</directory>
- <outputDirectory>/javadocs</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/ext</directory>
+ <outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/*.jar</directory>
- <outputDirectory>/lib</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/lib</directory>
+ <outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
<files>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1e18a92e/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dd2d34a..8a7c853 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -107,40 +107,25 @@ limitations under the License.
<version>2.4</version>
<executions>
<execution>
- <id>package-standalone</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
- <configuration>
- <attach>false</attach>
- <descriptors>
- <descriptor>src/assembly/standalone.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- <execution>
- <id>package-distribution</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <attach>true</attach>
- <descriptors>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
- </configuration>
</execution>
</executions>
<configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
<archive>
<manifest>
- <mainClass>org.apache.tinkerpop.gremlin.server.GremlinServer</mainClass>
+ <mainClass>org.apache.tinkerpop.gremlin.console.Console</mainClass>
</manifest>
</archive>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1e18a92e/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index 3844be9..618b538 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -21,41 +21,39 @@ limitations under the License.
</formats>
<fileSets>
<fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/ext</directory>
- <outputDirectory>/ext</outputDirectory>
+ <fileMode>0775</fileMode>
+ <directory>target/${project.artifactId}-${project.version}-standalone/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ <include>*.bat</include>
+ </includes>
</fileSet>
<fileSet>
<directory>conf</directory>
- <outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>scripts</directory>
- <outputDirectory>/scripts</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/data</directory>
+ <outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
- <directory>../target/docs/htmlsingle</directory>
- <outputDirectory>/docs</outputDirectory>
+ <directory>scripts</directory>
</fileSet>
<fileSet>
- <directory>../target/site/apidocs</directory>
- <outputDirectory>/javadocs</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/ext</directory>
+ <outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/*.jar</directory>
- <outputDirectory>/lib</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/docs</directory>
+ <outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>data</directory>
- <outputDirectory>/data</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../data</directory>
- <outputDirectory>/data</outputDirectory>
+ <directory>target/${project.artifactId}-${project.version}-standalone/lib</directory>
+ <outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
<files>