From 10cb453d4a00dd8319e4ca06230f960f81d2cc0a Mon Sep 17 00:00:00 2001 From: Rogiel Sulzbach Date: Sun, 25 Mar 2012 14:22:35 -0300 Subject: [PATCH] Improves the packaging process --- .../com/l2jserver/service/ServiceManager.java | 16 +++--- .../l2jserver2-gameserver-core/pom.xml | 2 +- .../main/generated/META-INF/sun-jaxb.episode | 50 +++++++++---------- .../model/template/AbstractTemplate.java | 2 +- .../model/template/ActorTemplate.java | 2 +- .../model/template/CalculatorFunction.java | 2 +- .../template/CalculatorFunctionOperation.java | 2 +- .../model/template/CharacterTemplate.java | 2 +- .../l2jserver/model/template/Coordinate.java | 2 +- .../model/template/ItemTemplate.java | 2 +- .../l2jserver/model/template/NPCTemplate.java | 2 +- .../model/template/ObjectFactory.java | 2 +- .../model/template/SkillTemplate.java | 2 +- .../l2jserver/model/template/Teleports.java | 2 +- .../l2jserver/model/template/ZoneType.java | 2 +- .../com/l2jserver/model/template/Zones.java | 2 +- .../network/broadcast/BroadcastService.java | 27 +++++++++- .../src/main/assembly/distribution-bin.xml | 2 +- 18 files changed, 73 insertions(+), 50 deletions(-) diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java index 0e2d37a91..798fa39e3 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/ServiceManager.java @@ -251,16 +251,16 @@ public class ServiceManager { return; knownServices.add(service); try { - logger.debug("{0}: Stopping service...", + logger.debug("{}: Stopping service...", serviceClass.getSimpleName()); stopDependencies(service); if (service instanceof ConfigurableService) { ((ConfigurableService) service).setConfiguration(null); } service.stop(); - logger.info("{0}: Service stopped!", serviceClass.getSimpleName()); + logger.info("{}: Service stopped!", serviceClass.getSimpleName()); } catch (ServiceStopException e) { - logger.error("{0}: Error stopping service: {1}", + logger.error("{}: Error stopping service: {}", serviceClass.getSimpleName(), e.getCause()); throw e; } @@ -331,21 +331,21 @@ public class ServiceManager { throw new ServiceStopException("Service is already stopped"); knownServices.add(service); try { - logger.debug("{0}: Restaring service...", + logger.debug("{}: Restaring service...", serviceClass.getSimpleName()); service.restart(); - logger.info("{0}: Service restarted!", serviceClass.getSimpleName()); + logger.info("{}: Service restarted!", serviceClass.getSimpleName()); return service; } catch (ServiceStartException e) { - logger.error("{0}: Error starting service: {1}", + logger.error("{}: Error starting service: {}", serviceClass.getSimpleName(), e.getCause()); throw e; } catch (ServiceStopException e) { - logger.error("{0}: Error stopping service: {1}", + logger.error("{}: Error stopping service: {}", serviceClass.getSimpleName(), e.getCause()); throw e; } catch (ServiceException e) { - logger.error("{0}: Error restarting service: {1}", + logger.error("{}: Error restarting service: {}", serviceClass.getSimpleName(), e.getCause()); throw e; } diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml b/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml index 90b317dce..0c69e682f 100644 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml @@ -59,7 +59,7 @@ -extension -Xinheritance - ${project.parent.basedir}/data/template + ../data/template *.xsd diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode index bd772bacf..727d7e22c 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode @@ -5,17 +5,9 @@ This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 See http://java.sun.com/xml/jaxb 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 --> - - - - - - - - @@ -24,14 +16,6 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT - - - - - - - - @@ -40,6 +24,14 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT + + + + + + + + @@ -60,6 +52,22 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT + + + + + + + + + + + + + + + + @@ -71,13 +79,5 @@ Generated on: 2012.03.25 at 10:36:48 AM BRT - - - - - - - - diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java index b3c018963..919dca3a2 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java index e6207b0b6..a912c76b3 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java index 07fbdc5b7..1d284966e 100644 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunction.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java index febf6b9b0..9d9de8d40 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CalculatorFunctionOperation.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java index d61578709..8731265ff 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/CharacterTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java index a5866bf29..ea4669f71 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Coordinate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java index 2e0532a77..ecc6a68ae 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ItemTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java index 3898b963d..835730ecd 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/NPCTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java index 9647b10b1..c8c15cb71 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java index 0dd084d0b..849430619 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/SkillTemplate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java index a938daf35..a5614ae5c 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Teleports.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java index d37f5b5c6..6562c0166 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ZoneType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java index ce018054a..404eb82a1 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/com/l2jserver/model/template/Zones.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10 // See http://java.sun.com/xml/jaxb // 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 // diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java index 9b71c7068..e191f6810 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java +++ b/l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/java/com/l2jserver/service/network/broadcast/BroadcastService.java @@ -16,13 +16,36 @@ */ 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.NPC; import com.l2jserver.model.world.WorldObject; 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 also sends some packets that are bounded to an event. + * This service hooks to the {@link WorldEventDispatcherServiceImpl} from + * {@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}. + *

+ * It can broadcast several types of {@link WorldObject} types, including, but + * not restricted to: + * + *

+ * + * 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 Rogiel */ diff --git a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml index bdfe4bbc1..bf04e4712 100755 --- a/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml +++ b/l2jserver2-gameserver/l2jserver2-gameserver-freya/src/main/assembly/distribution-bin.xml @@ -8,7 +8,7 @@ / - ${project.parent.basedir}/distribution + ${project.basedir}/distribution /