Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-05 23:22:47 +00:00
Code Releases Activity

Improves the packaging process

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-03-25 14:22:35 -03:00
parent c9cf151b33
commit 10cb453d4a
18 changed files with 73 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java
View File

@@ -251,16 +251,16 @@ public class ServiceManager {
return; return;
knownServices.add(service); knownServices.add(service);
try { try {
logger.debug("{0}: Stopping service...", logger.debug("{}: Stopping service...",
serviceClass.getSimpleName()); serviceClass.getSimpleName());
stopDependencies(service); stopDependencies(service);
if (service instanceof ConfigurableService) { if (service instanceof ConfigurableService) {
((ConfigurableService<?>) service).setConfiguration(null); ((ConfigurableService<?>) service).setConfiguration(null);
} }
service.stop(); service.stop();
logger.info("{0}: Service stopped!", serviceClass.getSimpleName()); logger.info("{}: Service stopped!", serviceClass.getSimpleName());
} catch (ServiceStopException e) { } catch (ServiceStopException e) {
logger.error("{0}: Error stopping service: {1}", logger.error("{}: Error stopping service: {}",
serviceClass.getSimpleName(), e.getCause()); serviceClass.getSimpleName(), e.getCause());
throw e; throw e;
} }
@@ -331,21 +331,21 @@ public class ServiceManager {
throw new ServiceStopException("Service is already stopped"); throw new ServiceStopException("Service is already stopped");
knownServices.add(service); knownServices.add(service);
try { try {
logger.debug("{0}: Restaring service...", logger.debug("{}: Restaring service...",
serviceClass.getSimpleName()); serviceClass.getSimpleName());
service.restart(); service.restart();
logger.info("{0}: Service restarted!", serviceClass.getSimpleName()); logger.info("{}: Service restarted!", serviceClass.getSimpleName());
return service; return service;
} catch (ServiceStartException e) { } catch (ServiceStartException e) {
logger.error("{0}: Error starting service: {1}", logger.error("{}: Error starting service: {}",
serviceClass.getSimpleName(), e.getCause()); serviceClass.getSimpleName(), e.getCause());
throw e; throw e;
} catch (ServiceStopException e) { } catch (ServiceStopException e) {
logger.error("{0}: Error stopping service: {1}", logger.error("{}: Error stopping service: {}",
serviceClass.getSimpleName(), e.getCause()); serviceClass.getSimpleName(), e.getCause());
throw e; throw e;
} catch (ServiceException e) { } catch (ServiceException e) {
logger.error("{0}: Error restarting service: {1}", logger.error("{}: Error restarting service: {}",
serviceClass.getSimpleName(), e.getCause()); serviceClass.getSimpleName(), e.getCause());
throw e; throw e;
} }

2
l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml
View File

@@ -59,7 +59,7 @@
<arg>-extension</arg> <arg>-extension</arg>
<arg>-Xinheritance</arg> <arg>-Xinheritance</arg>
</args> </args>
<schemaDirectory>${project.parent.basedir}/data/template</schemaDirectory> <schemaDirectory>../data/template</schemaDirectory>
<schemaIncludes> <schemaIncludes>
<include>*.xsd</include> <include>*.xsd</include>
</schemaIncludes> </schemaIncludes>

50
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode
View File

@@ -5,17 +5,9 @@
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Any modifications to this file will be lost upon recompilation of the source schema. Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2012.03.25 at 10:36:48 AM BRT Generated on: 2012.03.25 at 01:03:28 PM BRT
--> -->
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:character">
<jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -24,14 +16,6 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/> <jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -40,6 +24,14 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/> <jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::"> <jaxb:bindings scd="x-schema::">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -60,6 +52,22 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/> <jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:character">
<jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="zones"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
<jaxb:schemaBindings map="false"> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/> <jaxb:package name="com.l2jserver.model.template"/>
@@ -71,13 +79,5 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT
<jaxb:class ref="com.l2jserver.model.template.ZoneType"/> <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

2
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java
View File

@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.03.25 at 10:36:48 AM BRT // Generated on: 2012.03.25 at 01:03:28 PM BRT
// //

27
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java
View File

@@ -16,13 +16,36 @@
*/ */
package com.l2jserver.service.network.broadcast; package com.l2jserver.service.network.broadcast;
import com.l2jserver.model.template.NPCTemplate.Droplist.Item;
import com.l2jserver.model.world.L2Character; import com.l2jserver.model.world.L2Character;
import com.l2jserver.model.world.NPC;
import com.l2jserver.model.world.WorldObject; import com.l2jserver.model.world.WorldObject;
import com.l2jserver.service.Service; import com.l2jserver.service.Service;
import com.l2jserver.service.game.world.WorldService;
import com.l2jserver.service.game.world.event.WorldEvent;
import com.l2jserver.service.game.world.event.WorldEventDispatcherServiceImpl;
import com.l2jserver.service.network.NetworkService;
import com.l2jserver.service.network.model.packet.ServerPacket;
/** /**
* This service is responsible for sending neighbor {@link WorldObject} packets. * This service hooks to the {@link WorldEventDispatcherServiceImpl} from
* This service also sends some packets that are bounded to an event. * {@link WorldService} and captures world events near the character requesting
* broadcast messages. It will capture server-side world events and convert them
* into an network packet and send them though {@link NetworkService}.
* <p>
* It can broadcast several types of {@link WorldObject} types, including, but
* not restricted to:
*
* <ul>
* <li> {@link L2Character} - user playable character</li>
* <li> {@link NPC} - not playable characters and monsters</li>
* <li> {@link Item} - dropped items</li>
* </ul>
*
* This service main purpose is to keep server modularity. No other service
* should be aware of network packets. Services, instead of generating an
* {@link ServerPacket packet}, generate an {@link WorldEvent packet}, which
* gets converted into an {@link ServerPacket packet} by this service.
* *
* @author <a href="http://www.rogiel.com">Rogiel</a> * @author <a href="http://www.rogiel.com">Rogiel</a>
*/ */

2
l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml
View File

@@ -8,7 +8,7 @@
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.parent.basedir}/distribution</directory> <directory>${project.basedir}/distribution</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>