[Sensor Commits] SF.net SVN: sensor: [91] trunk/sensor-console

[<am...@us...>]

Revision: 91
Author:   amooy
Date:     2006-03-19 04:31:29 -0800 (Sun, 19 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/sensor/?rev=91&view=rev

Log Message:
-----------
SENSOR-1
Added activation.jar to the classpath using a maven jar override and reactivated the javamail dependency.

Tests on my local machine cannot reproduce SENSOR-1

Modified Paths:
--------------
    trunk/sensor-console/.classpath
    trunk/sensor-console/.settings/.component
    trunk/sensor-console/project.properties
    trunk/sensor-console/project.xml

Added Paths:
-----------
    trunk/sensor-console/lib/activation-1.0.2.jar
Modified: trunk/sensor-console/.classpath
===================================================================
--- trunk/sensor-console/.classpath	2006-03-19 11:30:54 UTC (rev 90)
+++ trunk/sensor-console/.classpath	2006-03-19 12:31:29 UTC (rev 91)
@@ -4,6 +4,8 @@
 	<classpathentry kind="src" path="/sensor-support"/>
 	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/javamail-1.3.2.jar"/>
+	<classpathentry kind="lib" path="lib/activation-1.0.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.codehaus.xfire/jars/xfire-all-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/stax/jars/stax-api-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>

Modified: trunk/sensor-console/.settings/.component
===================================================================
--- trunk/sensor-console/.settings/.component	2006-03-19 11:30:54 UTC (rev 90)
+++ trunk/sensor-console/.settings/.component	2006-03-19 12:31:29 UTC (rev 91)
@@ -16,6 +16,12 @@
 <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar">
 <dependency-type>uses</dependency-type>
 </dependent-module>
+<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//sensor-console/lib/javamail-1.3.2.jar">
+<dependency-type>uses</dependency-type>
+</dependent-module>
+<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//sensor-console/lib/activation-1.0.2.jar">
+<dependency-type>uses</dependency-type>
+</dependent-module>
 <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/org.codehaus.xfire/jars/xfire-all-1.0.jar">
 <dependency-type>uses</dependency-type>
 </dependent-module>

Added: trunk/sensor-console/lib/activation-1.0.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/sensor-console/lib/activation-1.0.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/sensor-console/project.properties
===================================================================
--- trunk/sensor-console/project.properties	2006-03-19 11:30:54 UTC (rev 90)
+++ trunk/sensor-console/project.properties	2006-03-19 12:31:29 UTC (rev 91)
@@ -2,10 +2,10 @@
 # Maven runtime behaviour
 # ------------------------------------------------------------------------
 
-maven.repo.remote = http://www.ibiblio.org/maven,\
+maven.repo.remote = http://mirrors.sunsite.dk/maven/,\
+                    http://www.ibiblio.org/maven,\
                     http://dist.codehaus.org,\
                     http://www.codeczar.com/maven,\
-                    http://mirrors.sunsite.dk/maven/,\
                     http://maven-plugins.sourceforge.net/maven
 
 
@@ -21,9 +21,18 @@
 maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/
 maven.javadoc.private = false
 
-maven.war.src = src/web
+maven.war.src = ${basedir}/src/web
 
 # ------------------------------------------------------------------------
+# M A V E N  J A R  O V E R R I D E
+# ------------------------------------------------------------------------
+maven.jar.override = on
+
+maven.jar.javamail=${basedir}/lib/javamail-1.3.2.jar
+maven.jar.activation=${basedir}/lib/activation-1.0.2.jar
+
+
+# ------------------------------------------------------------------------
 # Licenses
 # ------------------------------------------------------------------------
 

Modified: trunk/sensor-console/project.xml
===================================================================
--- trunk/sensor-console/project.xml	2006-03-19 11:30:54 UTC (rev 90)
+++ trunk/sensor-console/project.xml	2006-03-19 12:31:29 UTC (rev 91)
@@ -118,8 +118,24 @@
       <type>jar</type>
       <properties><war.bundle>true</war.bundle></properties>
     </dependency>
+
+    <dependency>
+      <groupId>javamail</groupId>
+      <artifactId>javamail</artifactId>
+      <version>1.3.2</version>
+      <jar>lib/javamail-1.3.2.jar</jar>
+      <type>jar</type>
+      <properties><war.bundle>true</war.bundle></properties>
+    </dependency>
+    <dependency>
+      <groupId>activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.0.2</version>
+      <jar>lib/activation-1.0.2.jar</jar>
+      <type>jar</type>
+      <properties><war.bundle>true</war.bundle></properties>
+    </dependency>
     
-    
     <dependency>
       <groupId>org.codehaus.xfire</groupId>
       <artifactId>xfire-all</artifactId>
@@ -162,14 +178,7 @@
       <type>jar</type>
       <properties><war.bundle>true</war.bundle></properties>
     </dependency>
-<!--    <dependency>
-      <groupId>javamail</groupId>
-      <artifactId>javamail</artifactId>
-      <version>1.3.2</version>
-      <jar>lib/javamail-1.3.2.jar</jar>
-      <type>jar</type>
-      <properties><war.bundle>true</war.bundle></properties>
-    </dependency>-->    
+
     
     <!-- Logging -->
     <dependency>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.