Project: * Clean-up (Eclipse cruft, unused files, etc...) * Git-specific changes * Maven POMs clean-up and changes for the build system * Version set to 1.0.0-0 in the development branches * Maven plug-ins updated to latest versions * Very partial dev. documentation added

.gitignore

@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>legacyworlds</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

build-tools/BUILD.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-cd `dirname $0`/..
-SRCDIR=`pwd`
-if [ "x$1" = "x" ]; then
-	OUTDIR="$SRCDIR";
-else
-	OUTDIR="$1";
-fi
-
-echo "Building Legacy Worlds..."
-mvn clean || { echo "Maven clean-up failed"; exit 1; };
-mvn package || { echo "Maven build failed"; exit 1; };
-
-echo "Copying files..."
-
-TEMPDIR=`mktemp -d`
-mkdir $TEMPDIR/legacyworlds
-mkdir $TEMPDIR/legacyworlds/server
-mkdir $TEMPDIR/legacyworlds/server/data
-mkdir $TEMPDIR/legacyworlds/web
-mkdir $TEMPDIR/legacyworlds/sql
-
-# Database and initial data
-cp -Rapv legacyworlds-server/legacyworlds-server-data/db-structure/database.sql $TEMPDIR/legacyworlds/sql
-cp -Rapv legacyworlds-server/legacyworlds-server-data/db-structure/db-config.txt $TEMPDIR/legacyworlds/sql/db-config-example.txt
-cp -Rapv legacyworlds-server/legacyworlds-server-data/db-structure/parts $TEMPDIR/legacyworlds/sql
-cp -Rapv legacyworlds-server/legacyworlds-server-main/data/* $TEMPDIR/legacyworlds/server/data
-# Server
-cp -Rapv legacyworlds-server/legacyworlds-server-main/target/*.jar $TEMPDIR/legacyworlds/server
-cp -Rapv legacyworlds-server/legacyworlds-server-main/target/lib $TEMPDIR/legacyworlds/server
-cp -Rapv legacyworlds-server/legacyworlds-server-main/data-source.xml $TEMPDIR/legacyworlds/server/data-source-example.xml
-# Tools
-cp -Rapv build-tools/server-config-example.sh $TEMPDIR/legacyworlds
-cp -Rapv build-tools/start-server.sh $TEMPDIR/legacyworlds
-cp -Rapv build-tools/stop-server.sh $TEMPDIR/legacyworlds
-cp -Rapv build-tools/execute-clit.sh $TEMPDIR/legacyworlds
-cp -Rapv build-tools/deploy.sh $TEMPDIR/legacyworlds
-# Web sites
-cp -Rapv legacyworlds-web/legacyworlds-web-*/target/*.war $TEMPDIR/legacyworlds/web
-
-echo "Preparing archive..."
-cd $TEMPDIR
-find $TEMPDIR/legacyworlds -type d -name .svn | xargs rm -rf
-tar cvjf $OUTDIR/legacyworlds.tar.bz2 legacyworlds || { echo "Archive generation failed"; exit 1; };
-
-echo "Removing temporary directory..."
-cd $SRCDIR
-rm -rf $TEMPDIR
-
-echo "All done. Legacy Worlds archive: $OUTDIR/legacyworlds.tar.bz2"

build-tools/deploy.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-COREDIR="$1"
-if [ "x$COREDIR" = "x" ] || ! [ -d "$COREDIR" ]; then
-	echo "Syntax: $0 main_dir tomcat_dir web_dir"
-	exit 1;
-fi
-
-TOMCATDIR="$2"
-if [ "x$TOMCATDIR" = "x" ] || ! [ -d "$TOMCATDIR" ]; then
-	echo "Syntax: $0 main_dir tomcat_dir web_dir"
-	exit 1;
-fi
-
-WEBDIR="$3"
-if [ "x$WEBDIR" = "x" ] || ! [ -d "$WEBDIR" ]; then
-	echo "Syntax: $0 main_dir tomcat_dir web_dir"
-	exit 1;
-fi
-
-
-cd `dirname $0`
-SRCDIR=`pwd`
-cp -Rap server web *-*.sh $COREDIR
-
-cd "$TOMCATDIR"
-if [ -L "lwmain.war" ]; then
-	rm -f lwmain.war lwadmin.war
-fi
-ln -s "$COREDIR/web/legacyworlds-web-main-"*.war lwmain.war
-ln -s "$COREDIR/web/legacyworlds-web-admin-"*.war lwadmin.war
-
-cd $WEBDIR
-unzip -o $COREDIR/web/legacyworlds-web-main-*.war "css/*" "js/*" "pjirc/*" "img/*"

legacyworlds-server-DIST/pom.xml

@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>legacyworlds-server</artifactId>
+		<groupId>com.deepclone.lw</groupId>
+		<version>1.0.0</version>
+		<relativePath>../legacyworlds-server/pom.xml</relativePath>
+	</parent>
+
+	<artifactId>legacyworlds-server-DIST</artifactId>
+	<version>${legacyworlds.version.main}.${legacyworlds.version.release}-${legacyworlds.version.build}</version>
+
+	<packaging>pom</packaging>
+	<name>Legacy Worlds - Server - Packaging</name>
+	<description>This Maven module is responsible for creating the Legacy Worlds server's packaging.</description>
+
+
+	<!-- Depend solely on the server's JAR, other dependencies will update automatically -->
+	<dependencies>
+		<dependency>
+			<groupId>com.deepclone.lw</groupId>
+			<artifactId>legacyworlds-server-main</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<!-- Use the assembly plug-in to generate the distribution -->
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distribution-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<attach>false</attach>
+							<finalName>legacyworlds-server-${project.version}</finalName>
+							<descriptors>
+								<descriptor>src/server.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

legacyworlds-server-DIST/src/server.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+	<!-- Legacy Worlds server assembly -->
+
+	<id>legacyworlds-server</id>
+	<formats>
+		<format>dir</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<dependencySets>
+
+		<!-- The server's main archive -->
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<outputDirectory>.</outputDirectory>
+			<unpack>false</unpack>
+			<includes>
+				<include>com.deepclone.lw:legacyworlds-server-main:jar</include>
+			</includes>
+		</dependencySet>
+
+		<!-- Libraries - both internal and external dependencies -->
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<outputDirectory>lib</outputDirectory>
+			<unpack>false</unpack>
+			<includes>
+				<include>*:jar</include>
+			</includes>
+			<excludes>
+				<exclude>com.deepclone.lw:legacyworlds-server-main:jar</exclude>
+			</excludes>
+		</dependencySet>
+
+	</dependencySets>
+
+	<fileSets>
+
+		<!-- Database definitions -->
+		<fileSet>
+			<directory>../legacyworlds-server-data/db-structure</directory>
+			<outputDirectory>sql</outputDirectory>
+			<includes>
+				<include>*.sql</include>
+				<include>*/*.sql</include>
+				<include>*/*/*.sql</include>
+			</includes>
+			<excludes>
+				<exclude>*.txt</exclude>
+			</excludes>
+		</fileSet>
+
+		<!-- Default data -->
+		<fileSet>
+			<directory>../legacyworlds-server-main/data</directory>
+			<outputDirectory>data</outputDirectory>
+			<includes>
+				<include>*.txt</include>
+				<include>*.xml</include>
+			</includes>
+		</fileSet>
+
+	</fileSets>
+
+	<files>
+
+		<!-- Data source configuration -->
+		<file>
+			<source>../legacyworlds-server-main/data-source.xml</source>
+			<destName>data-source.sample.xml</destName>
+			<fileMode>0600</fileMode>
+			<outputDirectory>.</outputDirectory>
+		</file>
+		
+		<!-- Database definition variables -->
+		<file>
+			<source>../legacyworlds-server-data/db-structure/db-config.txt</source>
+			<destName>db-config.sample.txt</destName>
+			<fileMode>0600</fileMode>
+			<outputDirectory>sql</outputDirectory>
+		</file>
+
+	</files>
+
+
+</assembly>

legacyworlds-server-beans-accounts/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>legacyworlds-server-beans</artifactId>
 		<groupId>com.deepclone.lw</groupId>
-		<version>5.99.1</version>
+		<version>1.0.0</version>
+		<relativePath>../legacyworlds-server-beans/pom.xml</relativePath>
 	</parent>
 
-	<groupId>com.deepclone.lw</groupId>
 	<artifactId>legacyworlds-server-beans-accounts</artifactId>
-	<name>Legacy Worlds account management</name>
+	<name>Legacy Worlds - Server - Components - Accounts</name>
-	<version>5.99.1</version>
+	<version>${legacyworlds.version.main}.${legacyworlds.version.release}-${legacyworlds.version.build}</version>
 	<description>This package contains the beans responsible for managing accounts, including registration, inactivity checks, bans and authentication.</description>
 </project>

legacyworlds-server-beans-bt/pom.xml

@@ -4,7 +4,8 @@
 	<parent>
 		<artifactId>legacyworlds-server-beans</artifactId>
 		<groupId>com.deepclone.lw</groupId>
-		<version>5.99.1</version>
+		<version>1.0.0</version>
+		<relativePath>../legacyworlds-server-beans/pom.xml</relativePath>
 	</parent>
 
 	<dependencies>
@@ -12,14 +13,11 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>${com.thoughtworks.xstream.version}</version>
-			<type>jar</type>
 		</dependency>
 
 	</dependencies>
 
-	<groupId>com.deepclone.lw</groupId>
 	<artifactId>legacyworlds-server-beans-bt</artifactId>
-	<version>5.99.1</version>
+	<name>Legacy Worlds - Server - Components - Bug tracking system</name>
-	<name>Legacy Worlds bug tracking system</name>
+	<version>${legacyworlds.version.main}.${legacyworlds.version.release}-${legacyworlds.version.build}</version>
 </project>

legacyworlds-server-beans-eventlog/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>legacyworlds-server-beans</artifactId>
 		<groupId>com.deepclone.lw</groupId>
-		<version>5.99.1</version>
+		<version>1.0.0</version>
+		<relativePath>../legacyworlds-server-beans/pom.xml</relativePath>
 	</parent>
 
-	<groupId>com.deepclone.lw</groupId>
 	<artifactId>legacyworlds-server-beans-eventlog</artifactId>
-	<version>5.99.1</version>
+	<name>Legacy Worlds - Server - Components - Logging</name>
-	<name>Legacy Worlds event log</name>
 	<description>This package is responsible for all logging in Legacy Worlds through three different beans (system event logger, admin event logger and user event logger).</description>
+	<version>${legacyworlds.version.main}.${legacyworlds.version.release}-${legacyworlds.version.build}</version>
 </project>

legacyworlds-server-beans-i18n/pom.xml

@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>legacyworlds-server-beans</artifactId>
+		<groupId>com.deepclone.lw</groupId>
+		<version>1.0.0</version>
+		<relativePath>../legacyworlds-server-beans/pom.xml</relativePath>
+	</parent>
+
+	<artifactId>legacyworlds-server-beans-i18n</artifactId>
+	<name>Legacy Worlds - Server - Components - Internationalisation</name>
+	<description>This package defines the components which control server-side internationalised text management.</description>
+	<version>${legacyworlds.version.main}.${legacyworlds.version.release}-${legacyworlds.version.build}</version>
+
+</project>