[snee] r1360 committed - Fix for ISSUE-33...

0 views
Skip to first unread message

sn...@googlecode.com

unread,
Feb 13, 2013, 4:10:16 AM2/13/13
to snee-...@googlegroups.com
Revision: 1360
Author: alasda...@gmail.com
Date: Wed Feb 13 01:09:25 2013
Log: Fix for ISSUE-33

Removed dependency on TechIdeas repository which is no longer available.
Have mocked up a local file repository within the code that seems to
resolve the issue.

Downgraded log4j to version 1.2.12 which removes some external dependencies
on JMS and javax which were beginning to become problematic.
http://code.google.com/p/snee/source/detail?r=1360

Added:
/trunk/snee/repository
/trunk/snee/repository/pom.xml
/trunk/snee/repository/src
/trunk/snee/repository/src/main
/trunk/snee/repository/src/main/resources
/trunk/snee/repository/src/main/resources/lib
/trunk/snee/repository/src/main/resources/lib/eu
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/0.1.1

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/0.1.1/sds-wsdl-0.1.1.jar

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/0.1.1/sds-wsdl-0.1.1.pom

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/maven-metadata-local.xml

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/maven-metadata-local.xml

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/wsdair-wsdl-0.0.1-SNAPSHOT.jar

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/wsdair-wsdl-0.0.1-SNAPSHOT.pom

/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/maven-metadata-local.xml
/trunk/snee/repository/src/main/resources/lib/net
/trunk/snee/repository/src/main/resources/lib/net/tinyos
/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos
/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/2.1

/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/2.1/tinyos-2.1.jar

/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/2.1/tinyos-2.1.pom

/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/maven-metadata-local.xml
/trunk/snee/repository/src/main/resources/lib/sds-wsdl-0.1.1.jar
/trunk/snee/repository/src/main/resources/lib/tinyos-2.1.jar

/trunk/snee/repository/src/main/resources/lib/wsdair-wsdl-0.0.1-SNAPSHOT.jar
Modified:
/trunk/snee/pom.xml

=======================================
--- /dev/null
+++ /trunk/snee/repository/pom.xml Wed Feb 13 01:09:25 2013
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>
+ <parent>
+ <groupId>uk.ac.manchester.cs.snee</groupId>
+ <artifactId>SNEE</artifactId>
+ <version>1.6.5-SNAPSHOT</version>
+ </parent>
+ <artifactId>repository</artifactId>
+ <name>Local Repository</name>
+ <description>A dummy module for storing dependencies that we don't have
in a proper Maven repository</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>eu.semsorgrid4env.service.sds</groupId>
+ <artifactId>sds-wsdl</artifactId>
+ <version>0.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.semsorgrid4env.service.wsdair</groupId>
+ <artifactId>wsdair-wsdl</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.tinyos</groupId>
+ <artifactId>tinyos</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>my-local-repo</id>
+ <url>file://${project.basedir}/src/main/resources/lib/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/0.1.1/sds-wsdl-0.1.1.jar
Wed Feb 13 01:09:25 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/0.1.1/sds-wsdl-0.1.1.pom
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eu.semsorgrid4env.service.sds</groupId>
+ <artifactId>sds-wsdl</artifactId>
+ <version>0.1.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/sds/sds-wsdl/maven-metadata-local.xml
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>eu.semsorgrid4env.service.sds</groupId>
+ <artifactId>sds-wsdl</artifactId>
+ <versioning>
+ <release>0.1.1</release>
+ <versions>
+ <version>0.1.1</version>
+ </versions>
+ <lastUpdated>20130213085003</lastUpdated>
+ </versioning>
+</metadata>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/maven-metadata-local.xml
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+ <groupId>eu.semsorgrid4env.service.wsdair</groupId>
+ <artifactId>wsdair-wsdl</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <versioning>
+ <snapshot>
+ <localCopy>true</localCopy>
+ </snapshot>
+ <lastUpdated>20130213084757</lastUpdated>
+ <snapshotVersions>
+ <snapshotVersion>
+ <extension>jar</extension>
+ <value>0.0.1-SNAPSHOT</value>
+ <updated>20130213084757</updated>
+ </snapshotVersion>
+ <snapshotVersion>
+ <extension>pom</extension>
+ <value>0.0.1-SNAPSHOT</value>
+ <updated>20130213084757</updated>
+ </snapshotVersion>
+ </snapshotVersions>
+ </versioning>
+</metadata>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/wsdair-wsdl-0.0.1-SNAPSHOT.jar
Wed Feb 13 01:09:25 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/0.0.1-SNAPSHOT/wsdair-wsdl-0.0.1-SNAPSHOT.pom
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eu.semsorgrid4env.service.wsdair</groupId>
+ <artifactId>wsdair-wsdl</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <description>POM was created from install:install-file</description>
+</project>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/eu/semsorgrid4env/service/wsdair/wsdair-wsdl/maven-metadata-local.xml
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>eu.semsorgrid4env.service.wsdair</groupId>
+ <artifactId>wsdair-wsdl</artifactId>
+ <versioning>
+ <versions>
+ <version>0.0.1-SNAPSHOT</version>
+ </versions>
+ <lastUpdated>20130213084757</lastUpdated>
+ </versioning>
+</metadata>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/2.1/tinyos-2.1.jar
Wed Feb 13 01:09:25 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/2.1/tinyos-2.1.pom
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.tinyos</groupId>
+ <artifactId>tinyos</artifactId>
+ <version>2.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/net/tinyos/tinyos/maven-metadata-local.xml
Wed Feb 13 01:09:25 2013
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>net.tinyos</groupId>
+ <artifactId>tinyos</artifactId>
+ <versioning>
+ <release>2.1</release>
+ <versions>
+ <version>2.1</version>
+ </versions>
+ <lastUpdated>20130213084517</lastUpdated>
+ </versioning>
+</metadata>
=======================================
--- /dev/null
+++ /trunk/snee/repository/src/main/resources/lib/sds-wsdl-0.1.1.jar Wed
Feb 13 01:09:25 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/snee/repository/src/main/resources/lib/tinyos-2.1.jar Wed Feb 13
01:09:25 2013
Binary file, no diff available.
=======================================
--- /dev/null
+++
/trunk/snee/repository/src/main/resources/lib/wsdair-wsdl-0.0.1-SNAPSHOT.jar
Wed Feb 13 01:09:25 2013
Binary file, no diff available.
=======================================
--- /trunk/snee/pom.xml Mon Aug 15 08:21:27 2011
+++ /trunk/snee/pom.xml Wed Feb 13 01:09:25 2013
@@ -13,6 +13,7 @@
<cxf.version>2.2.8</cxf.version>
</properties>
<modules>
+ <module>repository</module>
<module>snee-api</module>
<module>data-source</module>
<module>snee-core</module>
@@ -62,19 +63,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <artifactId>jmxri</artifactId>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxtools</artifactId>
- <groupId>com.sun.jdmk</groupId>
- </exclusion>
- </exclusions>
+ <version>1.2.12</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -119,12 +108,10 @@
<scope>compile</scope>
</dependency>
</dependencies>
-
<repositories>
<repository>
- <id>ssg4env.internal</id>
- <name>Archiva Managed Internal Repository</name>
- <url>http://ssg4env.techideas.net:8180/archiva/repository/internal</url>
+ <id>my-local-repo</id>
+ <url>file://${project.basedir}/repository/src/main/resources/lib/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -134,7 +121,8 @@
</repository>
</repositories>

- <distributionManagement>
+<!--
+ <distributionManagement>
<repository>
<id>ssg4env.internal</id>
<name>SSG4Env Internal Repository</name>
@@ -146,5 +134,5 @@
<url>http://ssg4env.techideas.net:8180/archiva/repository/internal</url>
</snapshotRepository>
</distributionManagement>
-
+ -->
</project>
Reply all
Reply to author
Forward
0 new messages