Permalink
Browse files

adding binary distribution build phase and startup scripts for axiom-…

…server
  • Loading branch information...
1 parent e2d272f commit 2e593b03d521d99873cb41d70ee256e9e28fd11a @hyperthunk committed Mar 30, 2009
View
@@ -14,4 +14,5 @@ ebin/
target/*
axiom-core/target/*
axiom-integration-test/target/*
+axiom-server/target/*
axiom-integration-test/integration-test.log
View
@@ -3,14 +3,20 @@ order to run the jtestr tests on os-x, it seems to be necessary that you use
Java 1.6. I've therefore made this the default source and JDK level in the pom
build section - you can probably change these without great issue on other platforms.
-Install:
+Local Install:
You should be able to accomplish a local maven install by running the command:
$ mvn clean install
-For installing the binaries and/or running axiom, please see the USAGE_GUIDE that
-sits alongside this document.
+To create a binary distribution you need to run the package task, specifying that
+the maven-assembly-plugin should run, like so:
+
+ $ mvn package assembly:assembly
+
+For installing the binaries and/or running axiom, please see the INSTALL doc that
+sits alongside this document.
+
Testing:
View
@@ -72,12 +72,22 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- not sure this is really needed now!? -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
<version>${camel.version}</version>
<scope>test</scope>
</dependency>
+
+ <!-- log4j specific jar is in here just for testing purposes -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
@@ -94,46 +94,14 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.2RC1</version>
- </dependency>-->
- <!--<dependency>
- <groupId>org.jtestr</groupId>
- <artifactId>jtestr</artifactId>
- <version>${jtestr.version}</version>
+
+ <!-- log4j specific jar is in here just for testing purposes -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
<scope>test</scope>
- </dependency>-->
+ </dependency>
</dependencies>
- <build>
- <!--<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <configuration>
- <tasks>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-
- <ant antfile="${basedir}/build.xml">
- <target name="integration-test"/>
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>-->
- </build>
</project>
View
@@ -48,46 +48,23 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${camel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
<version>${camel.version}</version>
</dependency>
- <!--<dependency>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- <version>1.0.3</version>
- <scope>test</scope>
- </dependency>-->
<dependency>
<groupId>org.axiom</groupId>
<artifactId>axiom-core</artifactId>
<version>0.3.0</version>
</dependency>
- <!-- springframework -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jruby</groupId>
- <artifactId>jruby-complete</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -98,8 +75,6 @@
<archive>
<index>true</index>
<manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
<mainClass>org.axiom.HostService</mainClass>
</manifest>
</archive>
@@ -28,8 +28,35 @@
package org.axiom;
+import org.axiom.service.Launcher;
+import org.springframework.context.ApplicationContext;
+
public class HostService {
- public static void main(final String... argv) {}
+ public static void main(final String... argv) throws ClassNotFoundException {
+ System.out.println(Launcher.class.getCanonicalName());
+ System.out.println(ApplicationContext.class.getCanonicalName());
+ System.out.println(Class.forName("JdkXmlValidator"));
+ /*System.out.println(Environment.AXIOM_HOME);*/
+
+ }
+
+ /*private static class EndorsedJarFinderDirectoryWalker extends DirectoryWalker {
+ public EndorsedJarFinderDirectoryWalker() {
+ super(FileFilterUtils.trueFileFilter(),
+ FileFilterUtils.suffixFileFilter(".jar"), -1);
+ }
+
+ @Override protected void handleFile(final File file, final int depth, final Collection results)
+ throws IOException {
+ //noinspection unchecked
+ results.add(file);
+ }
+ public Collection getEndorsedJars() throws IOException {
+ final ArrayList<File> results = new ArrayList<File>();
+ walk(new File("."), results);
+ return results;
+ }
+ }*/
}
View
49 pom.xml
@@ -33,7 +33,7 @@
<!-- properties -->
<properties>
- <axiom.version>0.3.0</axiom.version>
+ <axiom.version>0.4.0</axiom.version>
<ant.version>1.7.1</ant.version>
<asm.version>2.2.3</asm.version>
<jdk.version>1.6</jdk.version>
@@ -44,7 +44,6 @@
<camel.version>1.5.0</camel.version>
<activemq.version>4.1.1</activemq.version>
<spring.version>2.5.6</spring.version>
- <spring.classpath.uri>/Users/pax/.m2/repository/org/springframework/spring-core/2.5.6</spring.classpath.uri>
<spring.jruby.version>1.0</spring.jruby.version>
<jdave.version>1.1</jdave.version>
<surefire.version>2.3</surefire.version>
@@ -120,6 +119,31 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<!-- switched from commons logging to slf4j -->
<dependency>
@@ -247,14 +271,6 @@
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
-
- <!-- log4j specific jar is in here just for testing purposes -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.9</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
@@ -275,7 +291,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
- <!-- TODO: figure out what this should look like -->
<!--<executions>
<execution>
<phase>install</phase>
@@ -380,24 +395,25 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <!--<descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>-->
+ <descriptorRefs />
<descriptors>
<descriptor>src/assemble/assembly.xml</descriptor>
</descriptors>
</configuration>
- <executions>
+ <!-- setting executions for plugins at the top level of a multi-module
+ project doesn't work - you need to explicitly call them -->
+ <!--<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
</execution>
- </executions>
+ </executions>-->
</plugin>
</plugins>
</pluginManagement>
@@ -411,6 +427,7 @@
</build>
<reporting>
<plugins>
+ <!-- TODO: find a way to transform the jdave output into surefire compatible xml -->
<plugin>
<groupId>org.jdave</groupId>
<artifactId>jdave-report-plugin</artifactId>
View
@@ -0,0 +1,44 @@
+<assembly>
+ <id>distribution</id>
+ <formats>
+ <format>zip</format>
+ <!-- <format>tar.gz</format> -->
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.axiom:axiom-core</include>
+ <include>org.axiom:axiom-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/INSTALL*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/scripts</directory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <fileMode>0540</fileMode>
+ <outputDirectory>bin</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Oops, something went wrong.

0 comments on commit 2e593b0

Please sign in to comment.