Revision: 17784
Author: [email protected]
Date: Wed Apr 6 14:22:39 2011
Log: code and maven pom.xml clean up
http://code.google.com/p/mobicents/source/detail?r=17784
Modified:
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/pom.xml
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
Mon Mar 28 10:47:32 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
Wed Apr 6 14:22:39 2011
@@ -1,5 +1,4 @@
<classpath>
- <classpathentry kind="src" path="src/test/java"
output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
@@ -7,9 +6,7 @@
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.29/annotations-api-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.29/catalina-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/geronimo-spec/geronimo-spec-j2ee-jacc/1.0-rc4/geronimo-spec-j2ee-jacc-1.0-rc4.jar"/>
- <classpathentry kind="var"
path="M2_REPO/jboss/web/jbossweb/2.1.3.GA/jbossweb-2.1.3.GA.jar"
sourcepath="M2_REPO/jboss/web/jbossweb/2.1.3.GA/jbossweb-2.1.3.GA-sources.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.29/juli-6.0.29.jar"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.29/servlet-api-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-annotations/2.0.0-SNAPSHOT/sip-servlets-annotations-2.0.0-SNAPSHOT.jar"/>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/pom.xml
Mon Mar 28 02:08:34 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/pom.xml
Wed Apr 6 14:22:39 2011
@@ -2,9 +2,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.mobicents.servlet.sip.weld</groupId>
+ <parent>
+ <groupId>org.mobicents.servlet.sip.weld</groupId>
+ <artifactId>sip-servlets-weld-core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<artifactId>sip-servlets-weld</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sip-servlets-weld</name>
@@ -12,35 +17,18 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <log4j.version>1.2.14</log4j.version>
- <tomcat7.version>7.0.8</tomcat7.version>
- <tomcat6.version>6.0.29</tomcat6.version>
- <jboss5.version>5.1.0.GA</jboss5.version>
-
- <mss1.version>1.6.0-SNAPSHOT</mss1.version>
- <mss2.version>2.0.0-SNAPSHOT</mss2.version>
</properties>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>provided</scope>
</dependency>
@@ -48,7 +36,6 @@
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
- <version>1.1.0.Final</version>
<scope>provided</scope>
</dependency>
@@ -56,44 +43,19 @@
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-tomcat-7</artifactId>
- <version>${mss2.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mobicents.servlet.sip</groupId>
<artifactId>sip-servlets-impl</artifactId>
- <version>${mss2.version}</version>
<scope>provided</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-jboss5</artifactId>
- <version>${mss1.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mobicents.servlet.sip</groupId>
- <artifactId>sip-servlets-jboss5-metadata</artifactId>
- <version>${mss1.version}</version>
- <scope>provided</scope>
- </dependency>
--->
- <!-- JBossWeb dependencies -->
- <dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jbossweb</artifactId>
- <version>2.1.3.GA</version>
- <scope>provided</scope>
- </dependency>
<!-- Tomcat 7 Dependencies -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7.version}</version>
<scope>provided</scope>
</dependency>
@@ -101,32 +63,12 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>${tomcat6.version}</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
-
<id>make-my-jar-with-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
