Author: berndf
Date: Fri Mar 5 23:19:29 2010
New Revision: 919664
URL: http://svn.apache.org/viewvc?rev=919664&view=rev
Log:
VYSPER-184 mvn package now builds nice bin distributions including ready to go
scripts
Added:
mina/sandbox/vysper/trunk/server/core/src/assemble/
mina/sandbox/vysper/trunk/server/core/src/assemble/bin.xml
mina/sandbox/vysper/trunk/server/core/src/assemble/src.xml
Modified:
mina/sandbox/vysper/trunk/server/core/pom.xml
mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml
Modified: mina/sandbox/vysper/trunk/server/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/pom.xml?rev=919664&r1=919663&r2=919664&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/pom.xml (original)
+++ mina/sandbox/vysper/trunk/server/core/pom.xml Fri Mar 5 23:19:29 2010
@@ -107,6 +107,26 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<optional>true</optional>
</dependency>
@@ -142,20 +162,9 @@
<artifactId>smackx</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -168,6 +177,91 @@
</execution>
</executions>
</plugin>
- </plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+ <configurationDirectory>config</configurationDirectory>
+ <target>${project.build.directory}/appassembler</target>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ <environmentSetupFileName>setenv</environmentSetupFileName>
+ <!-- Generate bin scripts for windows and unix per default -->
+ <platforms>
+ <platform>windows</platform>
+ <platform>unix</platform>
+ </platforms>
+ <programs>
+ <program>
+ <mainClass>org.apache.vysper.spring.ServerMain</mainClass>
+ <!-- call it only run because appassemble will add .bat by
default on windows -->
+ <name>run</name>
+ <!-- Only generate windows bat script for this application -->
+ <platforms>
+ <platform>windows</platform>
+ </platforms>
+ </program>
+ <program>
+ <mainClass>org.apache.vysper.spring.ServerMain</mainClass>
+ <name>run.sh</name>
+ <!-- Only generate unix shell script for this application -->
+ <platforms>
+ <platform>unix</platform>
+ </platforms>
+ </program>
+ </programs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-appassemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+
+ <tasks>
+ <!-- this is only needed because windows freak out on
long cmd lines, so we strip of the absolute path
+ from the lib dir to make windows happy again
-->
+ <replace
file="${project.build.directory}/appassembler/bin/run.bat"
token="%BASEDIR%\lib" value="..\lib"/>
+ <replace
file="${project.build.directory}/appassembler/bin/run.sh" token="setenv"
value="setenv.sh"/>
+ </tasks>
+
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
Added: mina/sandbox/vysper/trunk/server/core/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/assemble/bin.xml?rev=919664&view=auto
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/assemble/bin.xml (added)
+++ mina/sandbox/vysper/trunk/server/core/src/assemble/bin.xml Fri Mar 5
23:19:29 2010
@@ -0,0 +1,102 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>bin</id>
+
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+ <!-- include txt files -->
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>ABOUT.*</include>
+ <include>ARCHITECTURE.*</include>
+ <include>HOW-TO.*</include>
+ <include>LICENSE.*</include>
+ <include>NOTICE.*</include>
+ <include>STATUS.*</include>
+ </includes>
+ </fileSet>
+ <!-- include configs -->
+ <fileSet>
+ <directory>src/main/config/</directory>
+ <outputDirectory>config</outputDirectory>
+ </fileSet>
+
+ <!-- create empty folders by copy a .dummy file -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>log</outputDirectory>
+ <includes>
+ <include>.dummy</include>
+ </includes>
+ </fileSet>
+
+ <!-- include stuff from appassembler -->
+ <fileSet>
+ <directory>target/appassembler/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/appassembler/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/scripts/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/scripts/</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>setenv.sh</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: mina/sandbox/vysper/trunk/server/core/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/assemble/src.xml?rev=919664&view=auto
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/assemble/src.xml (added)
+++ mina/sandbox/vysper/trunk/server/core/src/assemble/src.xml Fri Mar 5
23:19:29 2010
@@ -0,0 +1,43 @@
+<assembly>
+ <!--
+ 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.
+ -->
+ <id>src</id>
+ <!--
+ Generates a file including all the source tree excluding files/folders
+ starting with "." , *.bak and the target
+ -->
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/dist/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>.*</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**.bak</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml?rev=919664&r1=919663&r2=919664&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml
(original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/config/spring-config.xml Fri
Mar 5 23:19:29 2010
@@ -33,7 +33,7 @@
<bean id="bogusTrustManagerFactory"
class="org.apache.vysper.xmpp.cryptography.BogusTrustManagerFactory"/>
<bean id="tlsContextFactory"
class="org.apache.vysper.spring.ResourceBasedTLSContextFactory">
- <constructor-arg value="file:src/main/config/bogus_mina_tls.cert"/>
+ <constructor-arg value="classpath:bogus_mina_tls.cert"/>
<property name="password" value="boguspw" />
<property name="trustManagerFactory"><bean
class="org.apache.vysper.xmpp.cryptography.BogusTrustManagerFactory"
/></property>
</bean>
