You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@mina.apache.org by Bernd Fondermann <bf...@brainlounge.de> on 2010/03/07 11:18:02 UTC
Re: svn commit: r919852 - in /mina/sandbox/vysper/trunk: dist/ dist/.dummy
dist/pom.xml dist/src/ dist/src/main/ dist/src/main/assembly/ dist/src/main/assembly/bin.xml
dist/src/main/assembly/src.xml pom.xml server/core/pom.xml server/core/src/assemble/
Shouldn't we include MUC and PubSub, too?
Bernd
ngn@apache.org wrote:
> Author: ngn
> Date: Sat Mar 6 21:07:17 2010
> New Revision: 919852
>
> URL: http://svn.apache.org/viewvc?rev=919852&view=rev
> Log:
> Moving distribution package into a separate module
>
> Added:
> mina/sandbox/vysper/trunk/dist/ (with props)
> mina/sandbox/vysper/trunk/dist/.dummy
> mina/sandbox/vysper/trunk/dist/pom.xml
> mina/sandbox/vysper/trunk/dist/src/
> mina/sandbox/vysper/trunk/dist/src/main/
> mina/sandbox/vysper/trunk/dist/src/main/assembly/
> mina/sandbox/vysper/trunk/dist/src/main/assembly/bin.xml
> mina/sandbox/vysper/trunk/dist/src/main/assembly/src.xml
> Removed:
> mina/sandbox/vysper/trunk/server/core/src/assemble/
> Modified:
> mina/sandbox/vysper/trunk/pom.xml
> mina/sandbox/vysper/trunk/server/core/pom.xml
>
> Propchange: mina/sandbox/vysper/trunk/dist/
> ------------------------------------------------------------------------------
> --- svn:ignore (added)
> +++ svn:ignore Sat Mar 6 21:07:17 2010
> @@ -0,0 +1 @@
> +target
>
> Added: mina/sandbox/vysper/trunk/dist/.dummy
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/dist/.dummy?rev=919852&view=auto
> ==============================================================================
> (empty)
>
> Added: mina/sandbox/vysper/trunk/dist/pom.xml
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/dist/pom.xml?rev=919852&view=auto
> ==============================================================================
> --- mina/sandbox/vysper/trunk/dist/pom.xml (added)
> +++ mina/sandbox/vysper/trunk/dist/pom.xml Sat Mar 6 21:07:17 2010
> @@ -0,0 +1,243 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> + <!--
> + 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.
> + -->
> +
> +<project xmlns="http://maven.apache.org/POM/4.0.0">
> + <parent>
> + <artifactId>vysper-parent</artifactId>
> + <groupId>org.apache.vysper</groupId>
> + <version>1.0.0-SNAPSHOT</version>
> + </parent>
> + <modelVersion>4.0.0</modelVersion>
> + <groupId>org.apache.vysper</groupId>
> + <artifactId>vysper</artifactId>
> + <name>Apache Vysper</name>
> + <version>1.0.0-SNAPSHOT</version>
> +
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.vysper</groupId>
> + <artifactId>nbxml</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.vysper</groupId>
> + <artifactId>vysper-core</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-core</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-integration-jmx</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-filter-ssl</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-integration-spring</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.cyberneko.pull</groupId>
> + <artifactId>nekopull</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>javax.jcr</groupId>
> + <artifactId>jcr</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-core</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>xml-apis</groupId>
> + <artifactId>xml-apis</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>xerces</groupId>
> + <artifactId>xercesImpl</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>bouncycastle</groupId>
> + <artifactId>bcprov-jdk15</artifactId>
> + </dependency>
> +
> + <dependency>
> + <groupId>commons-codec</groupId>
> + <artifactId>commons-codec</artifactId>
> + </dependency>
> +
> + <!-- Logging -->
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-api</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>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>
> +
> + <!-- Spec compliance -->
> + <dependency>
> + <groupId>org.apache.vysper</groupId>
> + <artifactId>spec-compliance</artifactId>
> + <optional>true</optional>
> + </dependency>
> +
> + <dependency>
> + <groupId>net.sf.ehcache</groupId>
> + <artifactId>ehcache</artifactId>
> + <optional>true</optional>
> + </dependency>
> + </dependencies>
> +
> +
> + <build>
> + <plugins>
> + <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>
> + <plugin>
> + <artifactId>maven-assembly-plugin</artifactId>
> + <version>2.2-beta-2</version>
> + <configuration>
> + <descriptorSourceDirectory>src/main/assembly</descriptorSourceDirectory>
> + </configuration>
> + <executions>
> + <execution>
> + <id>make-assembly</id>
> + <phase>package</phase>
> + <goals>
> + <goal>attached</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> +
> + </plugins>
> + </build>
> +</project>
>
> Added: mina/sandbox/vysper/trunk/dist/src/main/assembly/bin.xml
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/dist/src/main/assembly/bin.xml?rev=919852&view=auto
> ==============================================================================
> --- mina/sandbox/vysper/trunk/dist/src/main/assembly/bin.xml (added)
> +++ mina/sandbox/vysper/trunk/dist/src/main/assembly/bin.xml Sat Mar 6 21:07:17 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>../server/core/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/dist/src/main/assembly/src.xml
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/dist/src/main/assembly/src.xml?rev=919852&view=auto
> ==============================================================================
> --- mina/sandbox/vysper/trunk/dist/src/main/assembly/src.xml (added)
> +++ mina/sandbox/vysper/trunk/dist/src/main/assembly/src.xml Sat Mar 6 21:07:17 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/pom.xml
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/pom.xml?rev=919852&r1=919851&r2=919852&view=diff
> ==============================================================================
> --- mina/sandbox/vysper/trunk/pom.xml (original)
> +++ mina/sandbox/vysper/trunk/pom.xml Sat Mar 6 21:07:17 2010
> @@ -26,7 +26,7 @@
> <modelVersion>4.0.0</modelVersion>
> <groupId>org.apache.vysper</groupId>
> <artifactId>vysper-parent</artifactId>
> - <name>Apache Vysper</name>
> + <name>Apache Vysper Parent</name>
> <version>1.0.0-SNAPSHOT</version>
> <packaging>pom</packaging>
> <url>http://mina.apache.org/vysper</url>
> @@ -395,6 +395,7 @@
> <module>speccompliance</module>
> <module>nbxml</module>
> <module>server</module>
> + <module>dist</module>
> </modules>
>
> <properties>
>
> Modified: mina/sandbox/vysper/trunk/server/core/pom.xml
> URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/pom.xml?rev=919852&r1=919851&r2=919852&view=diff
> ==============================================================================
> --- mina/sandbox/vysper/trunk/server/core/pom.xml (original)
> +++ mina/sandbox/vysper/trunk/server/core/pom.xml Sat Mar 6 21:07:17 2010
> @@ -108,21 +108,13 @@
> <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-log4j12</artifactId>
> + <scope>test</scope>
> </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>
> + <scope>test</scope>
> </dependency>
>
> <dependency>
> @@ -177,91 +169,6 @@
> </execution>
> </executions>
> </plugin>
> - <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>
>
>
>