Skip to content

Commit

Permalink
Cleaned up packaging to allow proper deployment and direct execution
Browse files Browse the repository at this point in the history
  • Loading branch information
afisk committed Mar 10, 2010
1 parent 34676be commit 07e5c60
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 1,528 deletions.
127 changes: 60 additions & 67 deletions pom.xml
View file
Expand Up @@ -37,95 +37,57 @@

<dependencies>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>

<dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<version>4.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<version>1.2.14</version>
</dependency>

<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
<version>3.2.0.BETA1</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<version>1.5.10</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<version>1.5.10</version>
</dependency>

</dependencies>

<!-- Dependency management is specified in alphabetical order with the
'groupId' as the primary criteria and 'artifactId' as the secondary
criteria. -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>

<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>3.2.0.BETA1</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.10</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.10</version>
</dependency>

</dependencies>

</dependencyManagement>

<distributionManagement>
<repository>
<id>littleshoot</id>
Expand Down Expand Up @@ -168,8 +130,39 @@
<showDeprecation>true</showDeprecation>
<compilerArguments><Xlint/></compilerArguments>
-->
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<executions>
<execution>
<id>latest-build</id>
<phase>package</phase>
<configuration>
<finalName>LittleProxy-LATEST</finalName>
<classesDirectory>target/classes</classesDirectory>
<useDefaultManifestFile>true</useDefaultManifestFile>
<outputDirectory>target</outputDirectory>
<appendAssemblyId>false</appendAssemblyId>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>

<archive>
<manifest>
<mainClass>org.littleshoot.proxy.Launcher</mainClass>
</manifest>
</archive>

</configuration>
</plugin>
<goals>
<goal>assembly</goal>
</goals>
</execution>
</executions>
</plugin>

<!--
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion run.bash
View file
Expand Up @@ -6,7 +6,7 @@ function die() {

mvn clean || die "Could not clean?"
mvn package -Dmaven.test.skip=true || die "Could not package proxy"
javaArgs="-jar target/littleproxy-0.3.jar $*"
javaArgs="-jar target/LittleProxy-LATEST.jar $*"
java6Path=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java

if [ -f "$java6Path" ]
Expand Down

0 comments on commit 07e5c60

Please sign in to comment.