[asterisk-scf-commits] team/dlee/jrouting.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Nov 18 12:44:43 CST 2010
branch "master" has been updated
via ff96efb8704aeecfd71b37f499db09199b0235e0 (commit)
via 36edaeca0c30bd8304873f7313c18614c1dedb35 (commit)
from cfbdb0da0aefcec4201bb123befd528ea4051e9c (commit)
Summary of changes:
jrouting.iml | 4 +-
jrouting.ipr | 24 +++++-----
pom.xml | 50 ++++++++++++++++++-
.../com/digium/asterisk/scf/jrouting/JRouting.java | 4 +-
4 files changed, 64 insertions(+), 18 deletions(-)
- Log -----------------------------------------------------------------
commit ff96efb8704aeecfd71b37f499db09199b0235e0
Author: David M. Lee <dlee at digium.com>
Date: Thu Nov 18 12:42:04 2010 -0600
build a self-contained .jar file.
diff --git a/jrouting.iml b/jrouting.iml
index f70b858..391d4ae 100644
--- a/jrouting.iml
+++ b/jrouting.iml
@@ -11,9 +11,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.digium.asteriskscf:api:0.0.1-SNAPSHOT" level="project" />
- <orderEntry type="library" name="Maven: com.zeroc:ice:3.4.1-dgm01" level="project" />
+ <orderEntry type="library" name="Maven: com.zeroc:ice:3.4.1-digium" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: com.digium.asteriskscf:jlogger-1.6:0.0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.5" level="project" />
</component>
</module>
diff --git a/jrouting.ipr b/jrouting.ipr
index 568682c..2b095f7 100644
--- a/jrouting.ipr
+++ b/jrouting.ipr
@@ -264,37 +264,37 @@
<root url="jar://$MAVEN_REPOSITORY$/com/digium/asteriskscf/api/0.0.1-SNAPSHOT/api-0.0.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: com.zeroc:ice:3.4.1-dgm01">
+ <library name="Maven: org.slf4j:slf4j-api:1.6.1">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-dgm01/ice-3.4.1-dgm01.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-dgm01/ice-3.4.1-dgm01-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-dgm01/ice-3.4.1-dgm01-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.slf4j:slf4j-api:1.6.1">
+ <library name="Maven: com.zeroc:ice:3.4.1-digium">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-digium/ice-3.4.1-digium.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-digium/ice-3.4.1-digium-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/zeroc/ice/3.4.1-digium/ice-3.4.1-digium-sources.jar!/" />
</SOURCES>
</library>
- <library name="Maven: org.slf4j:slf4j-simple:1.6.1">
+ <library name="Maven: com.digium.asteriskscf:jlogger-1.6:0.0.1-SNAPSHOT">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.6.1/slf4j-simple-1.6.1.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/digium/asteriskscf/jlogger-1.6/0.0.1-SNAPSHOT/jlogger-1.6-0.0.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.6.1/slf4j-simple-1.6.1-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/digium/asteriskscf/jlogger-1.6/0.0.1-SNAPSHOT/jlogger-1.6-0.0.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.6.1/slf4j-simple-1.6.1-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/com/digium/asteriskscf/jlogger-1.6/0.0.1-SNAPSHOT/jlogger-1.6-0.0.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>
diff --git a/pom.xml b/pom.xml
index 3a86fcb..98ef2fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,10 +37,15 @@
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-simple</artifactId>-->
+ <!--<version>1.6.1</version>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
+ <groupId>com.digium.asteriskscf</groupId>
+ <artifactId>jlogger-1.6</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -60,8 +65,47 @@
<target>${java.version}</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>
+ com.digium.asterisk.scf.jrouting.JRouting
+ </mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>com.digium.asterisk.scf.jrouting.JRouting</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
<properties>
commit 36edaeca0c30bd8304873f7313c18614c1dedb35
Author: David M. Lee <dlee at digium.com>
Date: Thu Nov 18 12:41:42 2010 -0600
Initialize jlogger.
diff --git a/src/main/java/com/digium/asterisk/scf/jrouting/JRouting.java b/src/main/java/com/digium/asterisk/scf/jrouting/JRouting.java
index 7928e6f..cba0fe2 100644
--- a/src/main/java/com/digium/asterisk/scf/jrouting/JRouting.java
+++ b/src/main/java/com/digium/asterisk/scf/jrouting/JRouting.java
@@ -28,6 +28,7 @@ import AsteriskSCF.System.Component.V1.Suspended;
import AsteriskSCF.System.Component.V1._ComponentServiceDisp;
import Ice.Current;
import Ice.Properties;
+import com.digium.asterisk.scf.jlogging.AsteriskScfLoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,9 +66,10 @@ public class JRouting extends Ice.Application {
adapter = communicator().createObjectAdapter("BasicRoutingServiceAdapter");
adapter.activate();
+ AsteriskScfLoggerFactory.initialize(adapter);
+
initialize();
registerWithServiceLocator();
-
communicator().waitForShutdown();
deregisterFromServiceLocator();
-----------------------------------------------------------------------
--
team/dlee/jrouting.git
More information about the asterisk-scf-commits
mailing list