From d2bfca5700ee9279c8bebda078afbd8407fb7479 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sat, 22 Oct 2011 02:22:47 -0200 Subject: [PATCH] Removes l2jserver2-site folder --- .gitignore | 3 +- l2jserver2-common/pom.xml | 3 +- .../src/assembly/distribution-h2-bin.xml | 54 -------- .../src/assembly/distribution-mysql5-bin.xml | 54 -------- .../assembly/distribution-orientdb-bin.xml | 51 ------- .../src/assembly/distribution-src.xml | 34 ----- l2jserver2-gameserver/pom.xml | 1 - .../model/id/provider/IDProviderModule.java | 2 + .../model/template/effect/EffectTemplate.java | 3 + .../effect/TeleportEffectTemplate.java | 6 +- l2jserver2-loginserver/pom.xml | 5 +- l2jserver2-site/dependencies.html | 0 l2jserver2-site/distribution-management.html | 125 ------------------ l2jserver2-site/images/close.gif | Bin 279 -> 0 bytes l2jserver2-site/index.html | 125 ------------------ l2jserver2-site/source-repository.html | 125 ------------------ l2jserver2-tools/pom.xml | 10 +- pom.xml | 9 +- 18 files changed, 29 insertions(+), 581 deletions(-) delete mode 100644 l2jserver2-common/src/assembly/distribution-h2-bin.xml delete mode 100644 l2jserver2-common/src/assembly/distribution-mysql5-bin.xml delete mode 100644 l2jserver2-common/src/assembly/distribution-orientdb-bin.xml delete mode 100644 l2jserver2-common/src/assembly/distribution-src.xml delete mode 100644 l2jserver2-site/dependencies.html delete mode 100644 l2jserver2-site/distribution-management.html delete mode 100644 l2jserver2-site/images/close.gif delete mode 100644 l2jserver2-site/index.html delete mode 100644 l2jserver2-site/source-repository.html diff --git a/.gitignore b/.gitignore index a68c78eea..95dd6d468 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ target/ # Find bugs configuration file -/.fbprefs \ No newline at end of file +/.fbprefs +/l2jserver2-site diff --git a/l2jserver2-common/pom.xml b/l2jserver2-common/pom.xml index 7d6bd1765..162f45d3e 100644 --- a/l2jserver2-common/pom.xml +++ b/l2jserver2-common/pom.xml @@ -8,10 +8,9 @@ .. l2jserver2-common - + L2JServer 2 commons This module contains all classes common to both login and game server - http://github.com/l2jserver2 2011 diff --git a/l2jserver2-common/src/assembly/distribution-h2-bin.xml b/l2jserver2-common/src/assembly/distribution-h2-bin.xml deleted file mode 100644 index 59b6145fa..000000000 --- a/l2jserver2-common/src/assembly/distribution-h2-bin.xml +++ /dev/null @@ -1,54 +0,0 @@ - - h2-bin - - - - zip - - - - - ${project.basedir} - / - - data/** - - - .gitignore - data/cache/** - data/pathing.db - data/database.h2.* - - - - ${project.basedir}/distribution/global - / - - - ${project.basedir}/distribution/sql - / - - - ${project.build.directory} - / - - ${project.artifactId}-${project.version}.jar - - - - - - /libs - false - false - runtime - - mysql:* - com.orientechnologies:* - - - - diff --git a/l2jserver2-common/src/assembly/distribution-mysql5-bin.xml b/l2jserver2-common/src/assembly/distribution-mysql5-bin.xml deleted file mode 100644 index 4356408ab..000000000 --- a/l2jserver2-common/src/assembly/distribution-mysql5-bin.xml +++ /dev/null @@ -1,54 +0,0 @@ - - mysql5-bin - - - - zip - - - - - ${project.basedir} - / - - data/** - - - .gitignore - data/cache/** - data/pathing.db - data/database.h2.* - - - - ${project.basedir}/distribution/global - / - - - ${project.basedir}/distribution/sql - / - - - ${project.build.directory} - / - - ${project.artifactId}-${project.version}.jar - - - - - - /libs - false - false - runtime - - com.h2database:* - com.orientechnologies:* - - - - diff --git a/l2jserver2-common/src/assembly/distribution-orientdb-bin.xml b/l2jserver2-common/src/assembly/distribution-orientdb-bin.xml deleted file mode 100644 index d95950133..000000000 --- a/l2jserver2-common/src/assembly/distribution-orientdb-bin.xml +++ /dev/null @@ -1,51 +0,0 @@ - - orientdb-bin - - - - zip - - - - - ${project.basedir} - / - - data/** - - - .gitignore - data/cache/** - data/pathing.db - data/database.h2.* - - - - ${project.basedir}/distribution/global - / - - - ${project.build.directory} - / - - ${project.artifactId}-${project.version}.jar - - - - - - /libs - false - false - runtime - - mysql:* - com.h2database:* - commons-dbcp:* - - - - \ No newline at end of file diff --git a/l2jserver2-common/src/assembly/distribution-src.xml b/l2jserver2-common/src/assembly/distribution-src.xml deleted file mode 100644 index f28a36822..000000000 --- a/l2jserver2-common/src/assembly/distribution-src.xml +++ /dev/null @@ -1,34 +0,0 @@ - - src - - - - zip - - - - - ${project.basedir} - / - - data/** - src/** - - - - ${project.basedir}/dist - / - - - - - /libs - false - false - runtime - - - diff --git a/l2jserver2-gameserver/pom.xml b/l2jserver2-gameserver/pom.xml index ac6412ebd..0eb854086 100644 --- a/l2jserver2-gameserver/pom.xml +++ b/l2jserver2-gameserver/pom.xml @@ -11,7 +11,6 @@ L2JServer 2 game server This game server is responsible for communicating the game client with the game virtual world. It provides data storage and processing along with broadcasting positioning data to other connected clients. - http://github.com/l2jserver2 2011 diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java index 52c3db917..fbe7caa62 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/provider/IDProviderModule.java @@ -32,6 +32,7 @@ import com.l2jserver.model.id.object.provider.NPCIDProvider; import com.l2jserver.model.id.object.provider.NPCIDProvider.NPCIDGuiceFactory; import com.l2jserver.model.id.object.provider.ObjectIDResolver; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; +import com.l2jserver.model.id.template.provider.EffectTemplateIDProvider; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider; import com.l2jserver.model.id.template.provider.SkillTemplateIDProvider; @@ -74,6 +75,7 @@ public class IDProviderModule extends AbstractModule { // TEMPLATE IDS install(new FactoryModuleBuilder().build(ItemTemplateIDProvider.class)); + install(new FactoryModuleBuilder().build(EffectTemplateIDProvider.class)); install(new FactoryModuleBuilder().build(SkillTemplateIDProvider.class)); install(new FactoryModuleBuilder() .build(CharacterTemplateIDProvider.class)); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java index 224474b4f..bf8db4ead 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/EffectTemplate.java @@ -21,11 +21,13 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.l2jserver.model.id.template.EffectTemplateID; import com.l2jserver.model.template.Template; import com.l2jserver.model.world.Actor; import com.l2jserver.model.world.actor.effect.Effect; +import com.l2jserver.util.jaxb.EffectTemplateIDAdapter; /** * @author Rogiel @@ -35,6 +37,7 @@ import com.l2jserver.model.world.actor.effect.Effect; @XmlSeeAlso({ TeleportEffectTemplate.class }) public abstract class EffectTemplate implements Template { @XmlAttribute(name = "id") + @XmlJavaTypeAdapter(EffectTemplateIDAdapter.class) protected EffectTemplateID id; protected EffectTemplate() { diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java index f9b666985..5e3cd358b 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/template/effect/TeleportEffectTemplate.java @@ -19,7 +19,9 @@ package com.l2jserver.model.template.effect; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.google.inject.Inject; import com.l2jserver.model.world.Actor; @@ -29,6 +31,7 @@ import com.l2jserver.service.game.spawn.CharacterAlreadyTeleportingServiceExcept import com.l2jserver.service.game.spawn.NotSpawnedServiceException; import com.l2jserver.service.game.spawn.SpawnService; import com.l2jserver.util.geometry.Coordinate; +import com.l2jserver.util.jaxb.CoordinateAdapter; /** * @author Rogiel @@ -42,7 +45,8 @@ public class TeleportEffectTemplate extends EffectTemplate { @XmlAttribute(name = "type", required = false) private SkillTeleportEffectLocation type = SkillTeleportEffectLocation.TARGET; - @XmlAttribute(name = "point") + @XmlElement(name = "point") + @XmlJavaTypeAdapter(CoordinateAdapter.class) private Coordinate coordinate; /** diff --git a/l2jserver2-loginserver/pom.xml b/l2jserver2-loginserver/pom.xml index 4b268f7fc..76b398ac4 100644 --- a/l2jserver2-loginserver/pom.xml +++ b/l2jserver2-loginserver/pom.xml @@ -8,10 +8,9 @@ .. l2jserver2-loginserver - + L2JServer 2 login server The login server provides authentication capabilities for the game clients. The login server can provide login for several game servers at the same time. - http://github.com/l2jserver2 2011 @@ -20,7 +19,7 @@ l2jserver2-common ${project.version} - + junit junit diff --git a/l2jserver2-site/dependencies.html b/l2jserver2-site/dependencies.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/l2jserver2-site/distribution-management.html b/l2jserver2-site/distribution-management.html deleted file mode 100644 index f2ca539b5..000000000 --- a/l2jserver2-site/distribution-management.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - Project Distribution Management - - - - - - - - - -
- -
-
-
-

Overview

The following is the distribution management information used by this project.

Download URL

https://github.com/l2jserver2/l2jserver2/downloads
-
-
-
-
-
- - - diff --git a/l2jserver2-site/images/close.gif b/l2jserver2-site/images/close.gif deleted file mode 100644 index 1c26bbc5264fcc943ad7b5a0f1a84daece211f34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmZ?wbhEHb6kyFkwP}e}6+mLp=yE)H5&?6cps==O-j2#K*@61O)i|`#U%|*xTD17#Qg5 z>nkWI$ji$M2ng`=^D}^ygDj#2&;c6F0P+h1n~g(5frm~PL&uV$l`S$eFDwzBDbhJD v>}Bvw*Al_tWna1PC9OaGVdk23i}vRhZI{iR^*V|n<^22a#~T_O9T}_vbswrX diff --git a/l2jserver2-site/index.html b/l2jserver2-site/index.html deleted file mode 100644 index 32e878868..000000000 --- a/l2jserver2-site/index.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - About - - - - - - - - - -
- -
-
-
-

About L2JServer 2 commons

This module contains all classes common to both login and game server

-
-
-
-
-
- - - diff --git a/l2jserver2-site/source-repository.html b/l2jserver2-site/source-repository.html deleted file mode 100644 index 7fdded8a8..000000000 --- a/l2jserver2-site/source-repository.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - Source Repository - - - - - - - - - -
- -
-
-
-

Overview

This project uses a Source Content Management System to manage its source code.

Web Access

The following is a link to the online source repository.

https://github.com/l2jserver2/l2jserver2/l2jserver2-common

Anonymous access

Refer to the documentation of the SCM used for more information about anonymously check out. The connection url is:

git://github.com/l2jserver2/l2jserver2.git/l2jserver2-common

Developer access

Refer to the documentation of the SCM used for more information about developer check out. The connection url is:

ssh://git@github.com:l2jserver2/l2jserver2.git/l2jserver2-common

Access from behind a firewall

Refer to the documentation of the SCM used for more information about access behind a firewall.

-
-
-
-
-
- - - diff --git a/l2jserver2-tools/pom.xml b/l2jserver2-tools/pom.xml index dbfb84fcd..163182e5e 100644 --- a/l2jserver2-tools/pom.xml +++ b/l2jserver2-tools/pom.xml @@ -8,13 +8,17 @@ .. l2jserver2-tools - + L2JServer 2 tools Module providing tools for developer usage only. Those tools are used for conversion and batch updating scripts. - http://github.com/l2jserver2 2011 - + + + com.l2jserver + l2jserver2-common + ${project.version} + com.l2jserver l2jserver2-gameserver diff --git a/pom.xml b/pom.xml index 9ca633960..1c780a9cb 100644 --- a/pom.xml +++ b/pom.xml @@ -13,10 +13,15 @@ L2JServer team http://www.l2jserver.com/ - http://github.com/l2jserver2 - + http://www.l2jserver2.com/ + https://github.com/l2jserver2/l2jserver2/downloads + + l2jserver2 + l2jserver2 + scp:l2jserver@l2jserver.com/l2jserver2.com +