From dfe136927ef3f547c017611c07febf5fe1d363a6 Mon Sep 17 00:00:00 2001 From: Frank Maritato Date: Thu, 29 Oct 2009 17:52:54 +0000 Subject: [PATCH] restructuring git-svn-id: https://lwes.svn.sourceforge.net/svnroot/lwes/lwes-java/trunk@250 a2f82657-cdd2-4550-bd36-68a8e7111808 --- pom.xml | 23 +++++++++++++++++----- .../java}/org/lwes/AttributeNotSetException.java | 0 src/{ => main/java}/org/lwes/BaseType.java | 0 src/{ => main/java}/org/lwes/Event.java | 0 src/{ => main/java}/org/lwes/EventFactory.java | 0 .../java}/org/lwes/EventSystemException.java | 0 .../java}/org/lwes/NoSuchAttributeException.java | 0 .../org/lwes/NoSuchAttributeTypeException.java | 0 .../java}/org/lwes/NoSuchEventException.java | 0 src/{ => main/java}/org/lwes/TypeID.java | 0 src/{ => main/java}/org/lwes/db/ESFParser.java | 0 src/{ => main/java}/org/lwes/db/ESFParser.jj | 0 .../java}/org/lwes/db/ESFParserConstants.java | 0 .../java}/org/lwes/db/ESFParserTokenManager.java | 0 .../java}/org/lwes/db/EventTemplateDB.java | 0 .../java}/org/lwes/db/ParseException.java | 0 .../java}/org/lwes/db/SimpleCharStream.java | 0 src/{ => main/java}/org/lwes/db/Token.java | 0 src/{ => main/java}/org/lwes/db/TokenMgrError.java | 0 .../org/lwes/emitter/AbstractEventEmitter.java | 0 .../java}/org/lwes/emitter/EventEmitter.java | 0 .../org/lwes/emitter/MulticastEventEmitter.java | 0 .../org/lwes/emitter/UnicastEventEmitter.java | 0 .../java}/org/lwes/listener/DatagramDequeuer.java | 0 .../java}/org/lwes/listener/DatagramEnqueuer.java | 0 .../org/lwes/listener/DatagramEventListener.java | 0 .../org/lwes/listener/DatagramQueueElement.java | 0 .../org/lwes/listener/EventCountingHandler.java | 0 .../java}/org/lwes/listener/EventHandler.java | 0 .../java}/org/lwes/listener/EventListener.java | 0 .../org/lwes/listener/EventPrintingHandler.java | 0 .../java}/org/lwes/listener/QueueElement.java | 0 .../java}/org/lwes/listener/ThreadedDequeuer.java | 0 .../java}/org/lwes/listener/ThreadedEnqueuer.java | 0 .../org/lwes/listener/ThreadedEventDispatcher.java | 0 .../org/lwes/listener/ThreadedEventListener.java | 0 .../java}/org/lwes/listener/ThreadedProcessor.java | 0 .../java}/org/lwes/serializer/Deserializer.java | 0 .../org/lwes/serializer/DeserializerState.java | 0 .../java}/org/lwes/serializer/Serializer.java | 0 .../java}/org/lwes/serializer/StringParser.java | 0 .../java}/org/lwes/util/CharacterEncoding.java | 0 .../java}/org/lwes/util/EncodedString.java | 0 src/{ => main/java}/org/lwes/util/IPAddress.java | 0 src/{ => main/java}/org/lwes/util/Log.java | 0 src/{ => main/java}/org/lwes/util/NumberCodec.java | 0 {tests/org => src/test}/lwes/EventTest.java | 0 .../test}/lwes/db/EventTemplateDBTest.esf | 0 .../test}/lwes/db/EventTemplateDBTest.java | 0 .../lwes/emitter/MockMulticastEventEmitter.java | 0 .../lwes/emitter/MulticastEventEmitterTest.java | 0 .../test}/lwes/serializer/StringParserTest.java | 0 {tests/org => src/test}/lwes/test/TestEmitter.java | 0 .../org => src/test}/lwes/test/TestListener.java | 0 .../test}/lwes/util/CharacterEncodingTest.java | 0 .../org => src/test}/lwes/util/IPAddressTest.java | 0 .../test}/lwes/util/NumberCodecTest.java | 0 57 files changed, 18 insertions(+), 5 deletions(-) rename src/{ => main/java}/org/lwes/AttributeNotSetException.java (100%) rename src/{ => main/java}/org/lwes/BaseType.java (100%) rename src/{ => main/java}/org/lwes/Event.java (100%) rename src/{ => main/java}/org/lwes/EventFactory.java (100%) rename src/{ => main/java}/org/lwes/EventSystemException.java (100%) rename src/{ => main/java}/org/lwes/NoSuchAttributeException.java (100%) rename src/{ => main/java}/org/lwes/NoSuchAttributeTypeException.java (100%) rename src/{ => main/java}/org/lwes/NoSuchEventException.java (100%) rename src/{ => main/java}/org/lwes/TypeID.java (100%) rename src/{ => main/java}/org/lwes/db/ESFParser.java (100%) rename src/{ => main/java}/org/lwes/db/ESFParser.jj (100%) rename src/{ => main/java}/org/lwes/db/ESFParserConstants.java (100%) rename src/{ => main/java}/org/lwes/db/ESFParserTokenManager.java (100%) rename src/{ => main/java}/org/lwes/db/EventTemplateDB.java (100%) rename src/{ => main/java}/org/lwes/db/ParseException.java (100%) rename src/{ => main/java}/org/lwes/db/SimpleCharStream.java (100%) rename src/{ => main/java}/org/lwes/db/Token.java (100%) rename src/{ => main/java}/org/lwes/db/TokenMgrError.java (100%) rename src/{ => main/java}/org/lwes/emitter/AbstractEventEmitter.java (100%) rename src/{ => main/java}/org/lwes/emitter/EventEmitter.java (100%) rename src/{ => main/java}/org/lwes/emitter/MulticastEventEmitter.java (100%) rename src/{ => main/java}/org/lwes/emitter/UnicastEventEmitter.java (100%) rename src/{ => main/java}/org/lwes/listener/DatagramDequeuer.java (100%) rename src/{ => main/java}/org/lwes/listener/DatagramEnqueuer.java (100%) rename src/{ => main/java}/org/lwes/listener/DatagramEventListener.java (100%) rename src/{ => main/java}/org/lwes/listener/DatagramQueueElement.java (100%) rename src/{ => main/java}/org/lwes/listener/EventCountingHandler.java (100%) rename src/{ => main/java}/org/lwes/listener/EventHandler.java (100%) rename src/{ => main/java}/org/lwes/listener/EventListener.java (100%) rename src/{ => main/java}/org/lwes/listener/EventPrintingHandler.java (100%) rename src/{ => main/java}/org/lwes/listener/QueueElement.java (100%) rename src/{ => main/java}/org/lwes/listener/ThreadedDequeuer.java (100%) rename src/{ => main/java}/org/lwes/listener/ThreadedEnqueuer.java (100%) rename src/{ => main/java}/org/lwes/listener/ThreadedEventDispatcher.java (100%) rename src/{ => main/java}/org/lwes/listener/ThreadedEventListener.java (100%) rename src/{ => main/java}/org/lwes/listener/ThreadedProcessor.java (100%) rename src/{ => main/java}/org/lwes/serializer/Deserializer.java (100%) rename src/{ => main/java}/org/lwes/serializer/DeserializerState.java (100%) rename src/{ => main/java}/org/lwes/serializer/Serializer.java (100%) rename src/{ => main/java}/org/lwes/serializer/StringParser.java (100%) rename src/{ => main/java}/org/lwes/util/CharacterEncoding.java (100%) rename src/{ => main/java}/org/lwes/util/EncodedString.java (100%) rename src/{ => main/java}/org/lwes/util/IPAddress.java (100%) rename src/{ => main/java}/org/lwes/util/Log.java (100%) rename src/{ => main/java}/org/lwes/util/NumberCodec.java (100%) rename {tests/org => src/test}/lwes/EventTest.java (100%) rename {tests/org => src/test}/lwes/db/EventTemplateDBTest.esf (100%) rename {tests/org => src/test}/lwes/db/EventTemplateDBTest.java (100%) rename {tests/org => src/test}/lwes/emitter/MockMulticastEventEmitter.java (100%) rename {tests/org => src/test}/lwes/emitter/MulticastEventEmitterTest.java (100%) rename {tests/org => src/test}/lwes/serializer/StringParserTest.java (100%) rename {tests/org => src/test}/lwes/test/TestEmitter.java (100%) rename {tests/org => src/test}/lwes/test/TestListener.java (100%) rename {tests/org => src/test}/lwes/util/CharacterEncodingTest.java (100%) rename {tests/org => src/test}/lwes/util/IPAddressTest.java (100%) rename {tests/org => src/test}/lwes/util/NumberCodecTest.java (100%) diff --git a/pom.xml b/pom.xml index 97404ce..5841d1a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.lwes lwes-java jar - 0.1.1 + 0.2.0-SNAPSHOT lwes-java http://maven.apache.org @@ -26,13 +26,26 @@ src tests - - src/main/resources - true - + + src/main/resources + true + + org.codehaus.mojo + javacc-maven-plugin + 2.6 + + + javacc + + javacc + + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/src/org/lwes/AttributeNotSetException.java b/src/main/java/org/lwes/AttributeNotSetException.java similarity index 100% rename from src/org/lwes/AttributeNotSetException.java rename to src/main/java/org/lwes/AttributeNotSetException.java diff --git a/src/org/lwes/BaseType.java b/src/main/java/org/lwes/BaseType.java similarity index 100% rename from src/org/lwes/BaseType.java rename to src/main/java/org/lwes/BaseType.java diff --git a/src/org/lwes/Event.java b/src/main/java/org/lwes/Event.java similarity index 100% rename from src/org/lwes/Event.java rename to src/main/java/org/lwes/Event.java diff --git a/src/org/lwes/EventFactory.java b/src/main/java/org/lwes/EventFactory.java similarity index 100% rename from src/org/lwes/EventFactory.java rename to src/main/java/org/lwes/EventFactory.java diff --git a/src/org/lwes/EventSystemException.java b/src/main/java/org/lwes/EventSystemException.java similarity index 100% rename from src/org/lwes/EventSystemException.java rename to src/main/java/org/lwes/EventSystemException.java diff --git a/src/org/lwes/NoSuchAttributeException.java b/src/main/java/org/lwes/NoSuchAttributeException.java similarity index 100% rename from src/org/lwes/NoSuchAttributeException.java rename to src/main/java/org/lwes/NoSuchAttributeException.java diff --git a/src/org/lwes/NoSuchAttributeTypeException.java b/src/main/java/org/lwes/NoSuchAttributeTypeException.java similarity index 100% rename from src/org/lwes/NoSuchAttributeTypeException.java rename to src/main/java/org/lwes/NoSuchAttributeTypeException.java diff --git a/src/org/lwes/NoSuchEventException.java b/src/main/java/org/lwes/NoSuchEventException.java similarity index 100% rename from src/org/lwes/NoSuchEventException.java rename to src/main/java/org/lwes/NoSuchEventException.java diff --git a/src/org/lwes/TypeID.java b/src/main/java/org/lwes/TypeID.java similarity index 100% rename from src/org/lwes/TypeID.java rename to src/main/java/org/lwes/TypeID.java diff --git a/src/org/lwes/db/ESFParser.java b/src/main/java/org/lwes/db/ESFParser.java similarity index 100% rename from src/org/lwes/db/ESFParser.java rename to src/main/java/org/lwes/db/ESFParser.java diff --git a/src/org/lwes/db/ESFParser.jj b/src/main/java/org/lwes/db/ESFParser.jj similarity index 100% rename from src/org/lwes/db/ESFParser.jj rename to src/main/java/org/lwes/db/ESFParser.jj diff --git a/src/org/lwes/db/ESFParserConstants.java b/src/main/java/org/lwes/db/ESFParserConstants.java similarity index 100% rename from src/org/lwes/db/ESFParserConstants.java rename to src/main/java/org/lwes/db/ESFParserConstants.java diff --git a/src/org/lwes/db/ESFParserTokenManager.java b/src/main/java/org/lwes/db/ESFParserTokenManager.java similarity index 100% rename from src/org/lwes/db/ESFParserTokenManager.java rename to src/main/java/org/lwes/db/ESFParserTokenManager.java diff --git a/src/org/lwes/db/EventTemplateDB.java b/src/main/java/org/lwes/db/EventTemplateDB.java similarity index 100% rename from src/org/lwes/db/EventTemplateDB.java rename to src/main/java/org/lwes/db/EventTemplateDB.java diff --git a/src/org/lwes/db/ParseException.java b/src/main/java/org/lwes/db/ParseException.java similarity index 100% rename from src/org/lwes/db/ParseException.java rename to src/main/java/org/lwes/db/ParseException.java diff --git a/src/org/lwes/db/SimpleCharStream.java b/src/main/java/org/lwes/db/SimpleCharStream.java similarity index 100% rename from src/org/lwes/db/SimpleCharStream.java rename to src/main/java/org/lwes/db/SimpleCharStream.java diff --git a/src/org/lwes/db/Token.java b/src/main/java/org/lwes/db/Token.java similarity index 100% rename from src/org/lwes/db/Token.java rename to src/main/java/org/lwes/db/Token.java diff --git a/src/org/lwes/db/TokenMgrError.java b/src/main/java/org/lwes/db/TokenMgrError.java similarity index 100% rename from src/org/lwes/db/TokenMgrError.java rename to src/main/java/org/lwes/db/TokenMgrError.java diff --git a/src/org/lwes/emitter/AbstractEventEmitter.java b/src/main/java/org/lwes/emitter/AbstractEventEmitter.java similarity index 100% rename from src/org/lwes/emitter/AbstractEventEmitter.java rename to src/main/java/org/lwes/emitter/AbstractEventEmitter.java diff --git a/src/org/lwes/emitter/EventEmitter.java b/src/main/java/org/lwes/emitter/EventEmitter.java similarity index 100% rename from src/org/lwes/emitter/EventEmitter.java rename to src/main/java/org/lwes/emitter/EventEmitter.java diff --git a/src/org/lwes/emitter/MulticastEventEmitter.java b/src/main/java/org/lwes/emitter/MulticastEventEmitter.java similarity index 100% rename from src/org/lwes/emitter/MulticastEventEmitter.java rename to src/main/java/org/lwes/emitter/MulticastEventEmitter.java diff --git a/src/org/lwes/emitter/UnicastEventEmitter.java b/src/main/java/org/lwes/emitter/UnicastEventEmitter.java similarity index 100% rename from src/org/lwes/emitter/UnicastEventEmitter.java rename to src/main/java/org/lwes/emitter/UnicastEventEmitter.java diff --git a/src/org/lwes/listener/DatagramDequeuer.java b/src/main/java/org/lwes/listener/DatagramDequeuer.java similarity index 100% rename from src/org/lwes/listener/DatagramDequeuer.java rename to src/main/java/org/lwes/listener/DatagramDequeuer.java diff --git a/src/org/lwes/listener/DatagramEnqueuer.java b/src/main/java/org/lwes/listener/DatagramEnqueuer.java similarity index 100% rename from src/org/lwes/listener/DatagramEnqueuer.java rename to src/main/java/org/lwes/listener/DatagramEnqueuer.java diff --git a/src/org/lwes/listener/DatagramEventListener.java b/src/main/java/org/lwes/listener/DatagramEventListener.java similarity index 100% rename from src/org/lwes/listener/DatagramEventListener.java rename to src/main/java/org/lwes/listener/DatagramEventListener.java diff --git a/src/org/lwes/listener/DatagramQueueElement.java b/src/main/java/org/lwes/listener/DatagramQueueElement.java similarity index 100% rename from src/org/lwes/listener/DatagramQueueElement.java rename to src/main/java/org/lwes/listener/DatagramQueueElement.java diff --git a/src/org/lwes/listener/EventCountingHandler.java b/src/main/java/org/lwes/listener/EventCountingHandler.java similarity index 100% rename from src/org/lwes/listener/EventCountingHandler.java rename to src/main/java/org/lwes/listener/EventCountingHandler.java diff --git a/src/org/lwes/listener/EventHandler.java b/src/main/java/org/lwes/listener/EventHandler.java similarity index 100% rename from src/org/lwes/listener/EventHandler.java rename to src/main/java/org/lwes/listener/EventHandler.java diff --git a/src/org/lwes/listener/EventListener.java b/src/main/java/org/lwes/listener/EventListener.java similarity index 100% rename from src/org/lwes/listener/EventListener.java rename to src/main/java/org/lwes/listener/EventListener.java diff --git a/src/org/lwes/listener/EventPrintingHandler.java b/src/main/java/org/lwes/listener/EventPrintingHandler.java similarity index 100% rename from src/org/lwes/listener/EventPrintingHandler.java rename to src/main/java/org/lwes/listener/EventPrintingHandler.java diff --git a/src/org/lwes/listener/QueueElement.java b/src/main/java/org/lwes/listener/QueueElement.java similarity index 100% rename from src/org/lwes/listener/QueueElement.java rename to src/main/java/org/lwes/listener/QueueElement.java diff --git a/src/org/lwes/listener/ThreadedDequeuer.java b/src/main/java/org/lwes/listener/ThreadedDequeuer.java similarity index 100% rename from src/org/lwes/listener/ThreadedDequeuer.java rename to src/main/java/org/lwes/listener/ThreadedDequeuer.java diff --git a/src/org/lwes/listener/ThreadedEnqueuer.java b/src/main/java/org/lwes/listener/ThreadedEnqueuer.java similarity index 100% rename from src/org/lwes/listener/ThreadedEnqueuer.java rename to src/main/java/org/lwes/listener/ThreadedEnqueuer.java diff --git a/src/org/lwes/listener/ThreadedEventDispatcher.java b/src/main/java/org/lwes/listener/ThreadedEventDispatcher.java similarity index 100% rename from src/org/lwes/listener/ThreadedEventDispatcher.java rename to src/main/java/org/lwes/listener/ThreadedEventDispatcher.java diff --git a/src/org/lwes/listener/ThreadedEventListener.java b/src/main/java/org/lwes/listener/ThreadedEventListener.java similarity index 100% rename from src/org/lwes/listener/ThreadedEventListener.java rename to src/main/java/org/lwes/listener/ThreadedEventListener.java diff --git a/src/org/lwes/listener/ThreadedProcessor.java b/src/main/java/org/lwes/listener/ThreadedProcessor.java similarity index 100% rename from src/org/lwes/listener/ThreadedProcessor.java rename to src/main/java/org/lwes/listener/ThreadedProcessor.java diff --git a/src/org/lwes/serializer/Deserializer.java b/src/main/java/org/lwes/serializer/Deserializer.java similarity index 100% rename from src/org/lwes/serializer/Deserializer.java rename to src/main/java/org/lwes/serializer/Deserializer.java diff --git a/src/org/lwes/serializer/DeserializerState.java b/src/main/java/org/lwes/serializer/DeserializerState.java similarity index 100% rename from src/org/lwes/serializer/DeserializerState.java rename to src/main/java/org/lwes/serializer/DeserializerState.java diff --git a/src/org/lwes/serializer/Serializer.java b/src/main/java/org/lwes/serializer/Serializer.java similarity index 100% rename from src/org/lwes/serializer/Serializer.java rename to src/main/java/org/lwes/serializer/Serializer.java diff --git a/src/org/lwes/serializer/StringParser.java b/src/main/java/org/lwes/serializer/StringParser.java similarity index 100% rename from src/org/lwes/serializer/StringParser.java rename to src/main/java/org/lwes/serializer/StringParser.java diff --git a/src/org/lwes/util/CharacterEncoding.java b/src/main/java/org/lwes/util/CharacterEncoding.java similarity index 100% rename from src/org/lwes/util/CharacterEncoding.java rename to src/main/java/org/lwes/util/CharacterEncoding.java diff --git a/src/org/lwes/util/EncodedString.java b/src/main/java/org/lwes/util/EncodedString.java similarity index 100% rename from src/org/lwes/util/EncodedString.java rename to src/main/java/org/lwes/util/EncodedString.java diff --git a/src/org/lwes/util/IPAddress.java b/src/main/java/org/lwes/util/IPAddress.java similarity index 100% rename from src/org/lwes/util/IPAddress.java rename to src/main/java/org/lwes/util/IPAddress.java diff --git a/src/org/lwes/util/Log.java b/src/main/java/org/lwes/util/Log.java similarity index 100% rename from src/org/lwes/util/Log.java rename to src/main/java/org/lwes/util/Log.java diff --git a/src/org/lwes/util/NumberCodec.java b/src/main/java/org/lwes/util/NumberCodec.java similarity index 100% rename from src/org/lwes/util/NumberCodec.java rename to src/main/java/org/lwes/util/NumberCodec.java diff --git a/tests/org/lwes/EventTest.java b/src/test/lwes/EventTest.java similarity index 100% rename from tests/org/lwes/EventTest.java rename to src/test/lwes/EventTest.java diff --git a/tests/org/lwes/db/EventTemplateDBTest.esf b/src/test/lwes/db/EventTemplateDBTest.esf similarity index 100% rename from tests/org/lwes/db/EventTemplateDBTest.esf rename to src/test/lwes/db/EventTemplateDBTest.esf diff --git a/tests/org/lwes/db/EventTemplateDBTest.java b/src/test/lwes/db/EventTemplateDBTest.java similarity index 100% rename from tests/org/lwes/db/EventTemplateDBTest.java rename to src/test/lwes/db/EventTemplateDBTest.java diff --git a/tests/org/lwes/emitter/MockMulticastEventEmitter.java b/src/test/lwes/emitter/MockMulticastEventEmitter.java similarity index 100% rename from tests/org/lwes/emitter/MockMulticastEventEmitter.java rename to src/test/lwes/emitter/MockMulticastEventEmitter.java diff --git a/tests/org/lwes/emitter/MulticastEventEmitterTest.java b/src/test/lwes/emitter/MulticastEventEmitterTest.java similarity index 100% rename from tests/org/lwes/emitter/MulticastEventEmitterTest.java rename to src/test/lwes/emitter/MulticastEventEmitterTest.java diff --git a/tests/org/lwes/serializer/StringParserTest.java b/src/test/lwes/serializer/StringParserTest.java similarity index 100% rename from tests/org/lwes/serializer/StringParserTest.java rename to src/test/lwes/serializer/StringParserTest.java diff --git a/tests/org/lwes/test/TestEmitter.java b/src/test/lwes/test/TestEmitter.java similarity index 100% rename from tests/org/lwes/test/TestEmitter.java rename to src/test/lwes/test/TestEmitter.java diff --git a/tests/org/lwes/test/TestListener.java b/src/test/lwes/test/TestListener.java similarity index 100% rename from tests/org/lwes/test/TestListener.java rename to src/test/lwes/test/TestListener.java diff --git a/tests/org/lwes/util/CharacterEncodingTest.java b/src/test/lwes/util/CharacterEncodingTest.java similarity index 100% rename from tests/org/lwes/util/CharacterEncodingTest.java rename to src/test/lwes/util/CharacterEncodingTest.java diff --git a/tests/org/lwes/util/IPAddressTest.java b/src/test/lwes/util/IPAddressTest.java similarity index 100% rename from tests/org/lwes/util/IPAddressTest.java rename to src/test/lwes/util/IPAddressTest.java diff --git a/tests/org/lwes/util/NumberCodecTest.java b/src/test/lwes/util/NumberCodecTest.java similarity index 100% rename from tests/org/lwes/util/NumberCodecTest.java rename to src/test/lwes/util/NumberCodecTest.java -- 2.11.4.GIT