Menu
▾
▴
[Sensor Commits] SF.net SVN: sensor: [85] trunk/sensor-core
|
From: <am...@us...> - 2006-03-17 21:00:45
|
Revision: 85 Author: amooy Date: 2006-03-17 13:00:32 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/sensor/?rev=85&view=rev Log Message: ----------- Reactivated the Maviclipse plugin to keep our eclipse classpaths and WTP deployments up to date with our maven project.xml files. This works with Maviclipse 1.0.3 or higher Modified Paths: -------------- trunk/sensor-console/.classpath trunk/sensor-console/.project trunk/sensor-console/.settings/.component trunk/sensor-console/project.xml trunk/sensor-core/.classpath trunk/sensor-core/.project trunk/sensor-support/.classpath trunk/sensor-support/.project trunk/sensor-support/.settings/.component trunk/sensor-support/project.xml Modified: trunk/sensor-console/.classpath =================================================================== --- trunk/sensor-console/.classpath 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-console/.classpath 2006-03-17 21:00:32 UTC (rev 85) @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="test/java"/> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/sensor-core"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/sensor-support"/> + <classpathentry kind="src" path="/sensor-core"/> + <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="var" path="MAVEN_REPO/xfire/jars/xfire-all-1.0-M6a.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"/> <classpathentry kind="var" path="MAVEN_REPO/woodstox/jars/wstx-asl-2.0.3.jar"/> @@ -22,8 +18,12 @@ <classpathentry kind="var" path="MAVEN_REPO/velocity-tools/jars/velocity-tools-1.2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/velocity-tools/jars/velocity-tools-generic-1.2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/com.agical.rmock/jars/rmock-2.0.0-rc-5.jar"/> <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="src/java"/> + <classpathentry output="target/test-classes" kind="src" path="test/java"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/sensor-console/.project =================================================================== --- trunk/sensor-console/.project 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-console/.project 2006-03-17 21:00:32 UTC (rev 85) @@ -8,6 +8,11 @@ </projects> <buildSpec> <buildCommand> + <name>nl.inspiring.maviclipse.core.maviclipseBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -24,6 +29,7 @@ </buildCommand> </buildSpec> <natures> + <nature>nl.inspiring.maviclipse.core.maviclipseNature</nature> <nature>org.springframework.ide.eclipse.core.springnature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> Modified: trunk/sensor-console/.settings/.component =================================================================== --- trunk/sensor-console/.settings/.component 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-console/.settings/.component 2006-03-17 21:00:32 UTC (rev 85) @@ -3,6 +3,7 @@ <wb-module deploy-name="sensor-console"> <wb-resource deploy-path="/" source-path="/src/web"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/java"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/test/java"/> <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/sensor-core/sensor-core"> <dependency-type>uses</dependency-type> </dependent-module> @@ -15,7 +16,7 @@ <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/var/MAVEN_REPO/xfire/jars/xfire-all-1.0-M6a.jar"> +<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> <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/stax/jars/stax-api-1.0.jar"> @@ -24,7 +25,7 @@ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/jdom/jars/jdom-1.0.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/wstx/jars/wstx-asl-2.0.3.jar"> +<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/woodstox/jars/wstx-asl-2.0.3.jar"> <dependency-type>uses</dependency-type> </dependent-module> <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/jaxen/jars/jaxen-1.1-beta-8.jar"> @@ -45,48 +46,18 @@ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/taglibs/jars/standard-1.0.6.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/sensor/jars/sensor-core-0.1-dev.jar"> +<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/velocity/jars/velocity-1.4.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/sensor/jars/sensor-support-0.1-dev.jar"> +<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/velocity-tools/jars/velocity-tools-1.2.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/springframework/jars/spring-1.2.6.jar"> +<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/velocity-tools/jars/velocity-tools-generic-1.2.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/aopalliance/jars/aopalliance-1.0.jar"> +<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/var/MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"> <dependency-type>uses</dependency-type> </dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/xfire/jars/xfire-all-1.0-M6a.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/stax/jars/stax-api-1.0.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/jdom/jars/jdom-1.0.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/wstx/jars/wstx-asl-2.0.3.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/jaxen/jars/jaxen-1.1-beta-8.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/wsdl4j/jars/wsdl4j-1.4.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/commons-logging/jars/commons-logging-1.0.4.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/log4j/jars/log4j-1.2.12.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/jstl/jars/jstl-1.0.6.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> -<dependent-module deploy-path="/WEB-INF/lib" handle="module:/classpath/lib//opt/build/maven-repository/taglibs/jars/standard-1.0.6.jar"> -<dependency-type>uses</dependency-type> -</dependent-module> <property name="context-root" value="sensor"/> <property name="java-output-path" value="/target/classes/"/> </wb-module> Modified: trunk/sensor-console/project.xml =================================================================== --- trunk/sensor-console/project.xml 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-console/project.xml 2006-03-17 21:00:32 UTC (rev 85) @@ -121,9 +121,9 @@ <dependency> - <groupId>xfire</groupId> + <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-all</artifactId> - <version>1.0-M6a</version> + <version>1.0</version> <type>jar</type> <properties><war.bundle>true</war.bundle></properties> </dependency> @@ -234,12 +234,12 @@ </dependency> <!-- Unit test specific dependencies --> -<!-- <dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <type>jar</type> - </dependency>--> + </dependency> <dependency> <groupId>com.agical.rmock</groupId> <artifactId>rmock</artifactId> @@ -319,17 +319,15 @@ </resources> </unitTest> - <resources> +<!-- <resources> <resource> <directory>${basedir}/src/resources</directory> <includes> <include>**/*.xml</include> - <include>**/*.dtd</include> <include>**/*.properties</include> - <include>**/*.xsd</include> </includes> </resource> - </resources> + </resources>--> </build> <reports> Modified: trunk/sensor-core/.classpath =================================================================== --- trunk/sensor-core/.classpath 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-core/.classpath 2006-03-17 21:00:32 UTC (rev 85) @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry output="target/classes" kind="src" path="src/java"/> - <classpathentry output="target/test-classes" kind="src" path="test/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.1.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.11.jar"/> <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/com.agical.rmock/jars/rmock-2.0.0-rc-5.jar"/> <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.11.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="src/java"/> + <classpathentry output="target/test-classes" kind="src" path="test/java"/> + <classpathentry including="**/*.xml|**/*.dtd|**/*.properties|**/*.xsd" output="target/classes" kind="src" path="src/resources"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/sensor-core/.project =================================================================== --- trunk/sensor-core/.project 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-core/.project 2006-03-17 21:00:32 UTC (rev 85) @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>nl.inspiring.maviclipse.core.maviclipseBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -17,6 +22,7 @@ </buildCommand> </buildSpec> <natures> + <nature>nl.inspiring.maviclipse.core.maviclipseNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> Modified: trunk/sensor-support/.classpath =================================================================== --- trunk/sensor-support/.classpath 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-support/.classpath 2006-03-17 21:00:32 UTC (rev 85) @@ -1,15 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="test/java"/> - <classpathentry sourcepath="/MAVEN_REPO/junit/zips/junit-src-3.8.1.zip" kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/sensor-core"/> + <classpathentry kind="src" path="/sensor-core"/> <classpathentry sourcepath="/MAVEN_REPO/springframework/zips/spring-src-1.2.6.zip" kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.6.jar"/> <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/> <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.12.jar"/> - <classpathentry sourcepath="/MAVEN_REPO/xfire/zips/xfire-all-1.0-M6a.zip" kind="var" path="MAVEN_REPO/xfire/jars/xfire-all-1.0-M6a.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"/> <classpathentry kind="var" path="MAVEN_REPO/woodstox/jars/wstx-asl-2.0.3.jar"/> @@ -17,8 +13,11 @@ <classpathentry kind="var" path="MAVEN_REPO/wsdl4j/jars/wsdl4j-1.4.jar"/> <classpathentry kind="lib" path="lib/javamail-1.3.2.jar"/> <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="var" path="MAVEN_REPO/com.agical.rmock/jars/rmock-2.0.0-rc-5.jar"/> - <classpathentry kind="src" path="src/resources"/> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.11.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="src/java"/> + <classpathentry output="target/test-classes" kind="src" path="test/java"/> + <classpathentry including="**/*.xml|**/*.dtd|**/*.properties|**/*.xsd" output="target/classes" kind="src" path="src/resources"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/sensor-support/.project =================================================================== --- trunk/sensor-support/.project 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-support/.project 2006-03-17 21:00:32 UTC (rev 85) @@ -6,6 +6,11 @@ </projects> <buildSpec> <buildCommand> + <name>nl.inspiring.maviclipse.core.maviclipseBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -22,6 +27,7 @@ </buildCommand> </buildSpec> <natures> + <nature>nl.inspiring.maviclipse.core.maviclipseNature</nature> <nature>org.springframework.ide.eclipse.core.springnature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> Modified: trunk/sensor-support/.settings/.component =================================================================== --- trunk/sensor-support/.settings/.component 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-support/.settings/.component 2006-03-17 21:00:32 UTC (rev 85) @@ -2,7 +2,7 @@ <project-modules id="moduleCoreId"> <wb-module deploy-name="sensor-support"> <wb-resource deploy-path="/" source-path="/src/java"/> +<wb-resource deploy-path="/" source-path="/src/resources"/> <wb-resource deploy-path="/" source-path="/test/java"/> -<wb-resource deploy-path="/" source-path="/src/resources"/> </wb-module> </project-modules> Modified: trunk/sensor-support/project.xml =================================================================== --- trunk/sensor-support/project.xml 2006-03-12 23:55:16 UTC (rev 84) +++ trunk/sensor-support/project.xml 2006-03-17 21:00:32 UTC (rev 85) @@ -81,7 +81,7 @@ <dependencies> - <!-- Sensor dependencies --> + <!-- Sensor internal dependencies --> <dependency> <groupId>sensor</groupId> <artifactId>sensor-core</artifactId> @@ -124,9 +124,9 @@ <!-- Runtime dependencies needed for unit testing (these are not compile-time dependencies) --> <dependency> - <groupId>xfire</groupId> + <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-all</artifactId> - <version>1.0-M6a</version> + <version>1.0</version> <type>jar</type> </dependency> <dependency> @@ -176,12 +176,12 @@ </dependency> <!-- Unit test specific dependencies --> -<!-- <dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <type>jar</type> - </dependency>--> + </dependency> <dependency> <groupId>com.agical.rmock</groupId> <artifactId>rmock</artifactId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
