Update project files for Eclipse Indigo (1.7)

2025-12-06 07:32:46 +00:00 · 2011-09-13 17:04:49 -03:00
parent ed702f7ab0
commit 8a8557606f
14 changed files with 117 additions and 65 deletions
--- a/.classpath
+++ b/.classpath
@@ -2,13 +2,13 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/scripts" path="data/script/quest"/>
-	<classpathentry kind="src" output="target/scripts" path="data/script/ai"/>
-	<classpathentry kind="src" output="target/scripts" path="data/plugin"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="src" output="target/tools-classes" path="src/tool/java"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="src" path="src/tool/java"/>
+	<classpathentry kind="src" path="data/plugin"/>
+	<classpathentry kind="src" path="data/script/ai"/>
+	<classpathentry kind="src" path="data/script/quest"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/.project
+++ b/.project
@@ -15,8 +15,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,6 @@
-#Thu Apr 28 15:32:21 BRT 2011
+#Tue Sep 13 16:51:09 BRT 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,5 @@
+#Tue Sep 13 15:33:16 BRT 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,59 @@
 	<description>Lineage II server emulator</description>
 	<inceptionYear>2011</inceptionYear>

+	<build>
+		<defaultGoal>package</defaultGoal>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<target>1.7</target>
+					<source>1.7</source>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>libs/</classpathPrefix>
+							<mainClass>com.l2jserver.L2JGameServerMain</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>assembly</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/distribution-mysql5-bin.xml</descriptor>
+						<descriptor>src/assembly/distribution-h2-bin.xml</descriptor>
+						<descriptor>src/assembly/distribution-src.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<!-- junit -->
 		<dependency>
@@ -170,58 +223,10 @@
 	</contributors>
 	<scm>
 		<connection>git://github.com/Rogiel/l2jserver2-gs.git</connection>
-		<developerConnection>ssh://git@github.com:Rogiel/l2jserver2-gs.git
-		</developerConnection>
+		<developerConnection>ssh://git@github.com:Rogiel/l2jserver2-gs.git</developerConnection>
 		<tag>master</tag>
 		<url>https://github.com/Rogiel/l2jserver2-gs</url>
 	</scm>
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.8.1</version>
-				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.3.1</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>libs/</classpathPrefix>
-							<mainClass>com.l2jserver.L2JGameServerMain</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>assembly</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2.1</version>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/distribution-mysql5-bin.xml</descriptor>
-						<descriptor>src/assembly/distribution-h2-bin.xml</descriptor>
-						<descriptor>src/assembly/distribution-src.xml</descriptor>
-					</descriptors>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<repositories>
 		<repository>
 			<id>repository.jboss.org</id>
--- a/src/main/java/com/l2jserver/model/world/character/CharacterStats.java
+++ b/src/main/java/com/l2jserver/model/world/character/CharacterStats.java
@@ -261,6 +261,7 @@ public class CharacterStats extends ActorStats<CharacterCalculatorContext> {
 	 */
 	private final L2Character character;

+	@SuppressWarnings("unchecked")
 	private static final CharacterCalculator calculator = new CharacterCalculator(
 			StatType.class);

--- a/src/main/java/com/l2jserver/service/ServiceConfiguration.java
+++ b/src/main/java/com/l2jserver/service/ServiceConfiguration.java
@@ -0,0 +1,28 @@
+/*
+ * This file is part of l2jserver <l2jserver.com>.
+ *
+ * l2jserver is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * l2jserver is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.service;
+
+import com.l2jserver.service.configuration.Configuration;
+
+/**
+ * Base interface for all {@link Service} {@link Configuration} classes.
+ * 
+ * @author <a href="http://www.rogiel.com">Rogiel</a>
+ */
+public interface ServiceConfiguration extends Configuration {
+
+}
--- a/src/main/java/com/l2jserver/service/ServiceModule.java
+++ b/src/main/java/com/l2jserver/service/ServiceModule.java
@@ -27,8 +27,8 @@ import com.l2jserver.service.core.Log4JLoggingService;
 import com.l2jserver.service.core.LoggingService;
 import com.l2jserver.service.core.threading.ThreadService;
 import com.l2jserver.service.core.threading.ThreadServiceImpl;
-import com.l2jserver.service.core.vfs.VFSService;
 import com.l2jserver.service.core.vfs.Java7VFSService;
+import com.l2jserver.service.core.vfs.VFSService;
 import com.l2jserver.service.database.DatabaseService;
 import com.l2jserver.service.database.JDBCDatabaseService;
 import com.l2jserver.service.game.AttackService;
--- a/src/main/java/com/l2jserver/service/core/vfs/VFSService.java
+++ b/src/main/java/com/l2jserver/service/core/vfs/VFSService.java
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.nio.file.Path;

 import com.l2jserver.service.Service;
+import com.l2jserver.service.ServiceConfiguration;
 import com.l2jserver.service.configuration.Configuration;
 import com.l2jserver.service.configuration.Configuration.ConfigurationName;

@@ -37,7 +38,7 @@ public interface VFSService extends Service {
 	 * @see Configuration
 	 */
 	@ConfigurationName("vfs")
-	public interface VFSConfiguration extends Configuration {
+	public interface VFSConfiguration extends ServiceConfiguration {
 		/**
 		 * @return the VFS root {@link URI}
 		 */
--- a/src/main/java/com/l2jserver/service/database/DatabaseService.java
+++ b/src/main/java/com/l2jserver/service/database/DatabaseService.java
@@ -19,6 +19,7 @@ package com.l2jserver.service.database;
 import com.l2jserver.model.Model;
 import com.l2jserver.model.id.ID;
 import com.l2jserver.service.Service;
+import com.l2jserver.service.ServiceConfiguration;
 import com.l2jserver.service.configuration.Configuration;
 import com.l2jserver.service.configuration.Configuration.ConfigurationName;

@@ -45,7 +46,7 @@ public interface DatabaseService extends Service {
 	 * @see Configuration
 	 */
 	@ConfigurationName("database")
-	public interface DatabaseConfiguration extends Configuration {
+	public interface DatabaseConfiguration extends ServiceConfiguration {
 	}

 	<M extends Model<I>, I extends ID<M>> DataAccessObject<M, I> getDAO(
--- a/src/main/java/com/l2jserver/service/game/template/TemplateService.java
+++ b/src/main/java/com/l2jserver/service/game/template/TemplateService.java
@@ -24,6 +24,7 @@ import com.l2jserver.model.world.Item;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.model.world.NPC;
 import com.l2jserver.service.Service;
+import com.l2jserver.service.ServiceConfiguration;

 /**
 * Service that loads {@link L2Character}, {@link NPC}, {@link Item} and
@@ -36,6 +37,9 @@ import com.l2jserver.service.Service;
 * @author <a href="http://www.rogiel.com">Rogiel</a>
 */
 public interface TemplateService extends Service {
+	public interface TemplateServiceConfiguration extends ServiceConfiguration {
+	}
+
 	/**
 	 * Get the template assigned with <tt>id</tt>
 	 * 
--- a/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java
+++ b/src/main/java/com/l2jserver/service/game/template/XMLTemplateService.java
@@ -53,7 +53,6 @@ import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.ServiceStopException;
 import com.l2jserver.service.cache.Cache;
 import com.l2jserver.service.cache.CacheService;
-import com.l2jserver.service.configuration.Configuration;
 import com.l2jserver.service.configuration.Configuration.ConfigurationName;
 import com.l2jserver.service.configuration.ConfigurationService;
 import com.l2jserver.service.core.LoggingService;
@@ -85,9 +84,10 @@ public class XMLTemplateService extends AbstractService implements

 	@SuppressWarnings("rawtypes")
 	private Cache<TemplateID, Template> templates;
-	
+
 	@ConfigurationName("template")
-	public interface XMLTemplateServiceConfiguration extends Configuration {
+	public interface XMLTemplateServiceConfiguration extends
+			TemplateServiceConfiguration {
 		@ConfigurationPropertyGetter(name = "template.directory", defaultValue = "data/templates")
 		URI getTemplateDirectory();

--- a/src/main/java/com/l2jserver/service/network/NetworkService.java
+++ b/src/main/java/com/l2jserver/service/network/NetworkService.java
@@ -25,6 +25,7 @@ import com.l2jserver.game.net.packet.ServerPacket;
 import com.l2jserver.model.id.object.CharacterID;
 import com.l2jserver.model.world.L2Character;
 import com.l2jserver.service.Service;
+import com.l2jserver.service.ServiceConfiguration;
 import com.l2jserver.service.configuration.Configuration;
 import com.l2jserver.service.configuration.Configuration.ConfigurationName;

@@ -71,7 +72,7 @@ public interface NetworkService extends Service {
 	 * @author <a href="http://www.rogiel.com">Rogiel</a>
 	 */
 	@ConfigurationName("network")
-	public interface NetworkConfiguration extends Configuration {
+	public interface NetworkConfiguration extends ServiceConfiguration {
 		/**
 		 * Get the server listen address
 		 * 
@@ -90,7 +91,6 @@ public interface NetworkService extends Service {
 		void setListenAddress(InetSocketAddress addr);
 	}

-	
 	/**
 	 * Registers a new client
 	 * 
--- a/src/main/java/com/l2jserver/util/geometry/Coordinate.java
+++ b/src/main/java/com/l2jserver/util/geometry/Coordinate.java
@@ -26,8 +26,6 @@ import org.apache.commons.math.geometry.Vector3D;
 * @author <a href="http://www.rogiel.com">Rogiel</a>
 */
 public class Coordinate {
-	private static final long serialVersionUID = 1L;
-
 	/**
 	 * The backing vector of this Coordinate
 	 */