[CIShell-SVN] SF.net SVN: cishell:[1161] branches/tycho

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1161
          http://cishell.svn.sourceforge.net/cishell/?rev=1161&view=rev
Author:   fugu13
Date:     2010-11-14 10:49:19 +0000 (Sun, 14 Nov 2010)

Log Message:
-----------
okay, moving right along. The prefuse version in maven repositories is not what we need, so this will not build, but everything else is going well

Modified Paths:
--------------
    branches/tycho/core/pom.xml
    branches/tycho/libs/pom.xml
    branches/tycho/libs/poms/wrappers/pom.xml

Added Paths:
-----------
    branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
    branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
    branches/tycho/core/org.cishell.reference.service.database/pom.xml
    branches/tycho/core/org.cishell.reference.services/pom.xml
    branches/tycho/core/org.cishell.service.autostart/pom.xml
    branches/tycho/core/org.cishell.service.database/pom.xml
    branches/tycho/core/org.cishell.utilities/pom.xml
    branches/tycho/core/org.cishell.utility.datastructure/pom.xml
    branches/tycho/core/org.cishell.utility.swt/pom.xml
    branches/tycho/libs/com.google.collections/
    branches/tycho/libs/com.google.collections/osgi.bnd
    branches/tycho/libs/com.google.collections/pom.xml
    branches/tycho/libs/org.prefuse/
    branches/tycho/libs/org.prefuse/osgi.bnd
    branches/tycho/libs/org.prefuse/pom.xml

Added: branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml
===================================================================

--- branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.algorithm.convertergraph/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.algorithm.convertergraph</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.reference.prefs.admin/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.reference.prefs.admin</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.reference.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.service.database/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.reference.service.database/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.reference.service.database</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.reference.services/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.reference.services/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.reference.services/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.reference.services</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.service.autostart/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.autostart/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.service.autostart/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.service.autostart</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.service.database/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.service.database/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.service.database/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.service.database</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.utilities/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utilities/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.utilities/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.utilities</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.utility.datastructure/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.datastructure/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.utility.datastructure/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.utility.datastructure</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Added: branches/tycho/core/org.cishell.utility.swt/pom.xml
===================================================================
--- branches/tycho/core/org.cishell.utility.swt/pom.xml	                        (rev 0)
+++ branches/tycho/core/org.cishell.utility.swt/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>cishell</groupId>
+    <artifactId>core-build</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <artifactId>org.cishell.utility.swt</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

Modified: branches/tycho/core/pom.xml
===================================================================
--- branches/tycho/core/pom.xml	2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/core/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
+
   <modelVersion>4.0.0</modelVersion>
 
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
-  
   <groupId>cishell</groupId>
   <artifactId>core-build</artifactId>
   <version>1.0.0</version>
+
   <packaging>pom</packaging>
 
   <properties>
@@ -18,7 +19,11 @@
   <modules>
     <module>org.cishell.framework</module>
     <module>org.cishell.reference</module>
-<!--    <module>tycho.demo.itp02.bundle.tests</module> -->
+    <module>org.cishell.service.autostart</module>
+    <module>org.cishell.service.database</module>
+    <module>org.cishell.algorithm.convertergraph</module>
+    <module>org.cishell.utilities</module>
+    <module>org.cishell.utility.datastructure</module>
   </modules>
 
   <dependencies>
@@ -27,14 +32,29 @@
       <artifactId>jung</artifactId>
       <version>1.7.6-001-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>cishell.libs</groupId>
+      <artifactId>com.google.collections</artifactId>
+      <version>1.0-001-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.6.2</version>
+    </dependency>
+    <dependency>
+      <groupId>cishell.libs</groupId>
+      <artifactId>org.prefuse</artifactId>
+      <version>beta-20060220-001-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 
   <repositories>
-   <repository>
-     <id>ganymede</id>
-     <layout>p2</layout>
-     <url>http://download.eclipse.org/releases/ganymede</url>
-   </repository>
+    <repository>
+      <id>ganymede</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/ganymede</url>
+    </repository>
   </repositories>
 
   <build>
@@ -56,4 +76,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>

Added: branches/tycho/libs/com.google.collections/osgi.bnd
===================================================================
--- branches/tycho/libs/com.google.collections/osgi.bnd	                        (rev 0)
+++ branches/tycho/libs/com.google.collections/osgi.bnd	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true

Added: branches/tycho/libs/com.google.collections/pom.xml
===================================================================
--- branches/tycho/libs/com.google.collections/pom.xml	                        (rev 0)
+++ branches/tycho/libs/com.google.collections/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <relativePath>../poms/wrappers/</relativePath>
+    <groupId>cishell.libs.build</groupId>
+    <artifactId>wrapper-bundle-settings</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <properties>
+    <bundle.symbolicName>com.google.collections</bundle.symbolicName>
+    <wrapped.groupId>com.google.collections</wrapped.groupId>
+    <wrapped.artifactId>google-collections</wrapped.artifactId>
+    <wrapped.version>1.0</wrapped.version>
+  </properties>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cishell.libs</groupId>
+  <artifactId>com.google.collections</artifactId>
+  <version>1.0-001-SNAPSHOT</version>
+
+  <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>${wrapped.groupId}</groupId>
+      <artifactId>${wrapped.artifactId}</artifactId>
+      <version>${wrapped.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>
\ No newline at end of file

Added: branches/tycho/libs/org.prefuse/osgi.bnd
===================================================================
--- branches/tycho/libs/org.prefuse/osgi.bnd	                        (rev 0)
+++ branches/tycho/libs/org.prefuse/osgi.bnd	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------------------
+# Use this file to add customized Bnd instructions for the wrapped library
+#--------------------------------------------------------------------------
+
+#
+# this unpacks the contents of the wrapped jar artifact inside the bundle
+# to also inline dependencies of this artifact add Embed-Transitive: true
+#
+Embed-Dependency: *;scope=compile|runtime;type=!pom;inline=true

Added: branches/tycho/libs/org.prefuse/pom.xml
===================================================================
--- branches/tycho/libs/org.prefuse/pom.xml	                        (rev 0)
+++ branches/tycho/libs/org.prefuse/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <relativePath>../poms/wrappers/</relativePath>
+    <groupId>cishell.libs.build</groupId>
+    <artifactId>wrapper-bundle-settings</artifactId>
+    <version>1.0.0</version>
+  </parent>
+
+  <properties>
+    <bundle.symbolicName>org.prefuse</bundle.symbolicName>
+    <wrapped.groupId>org.prefuse</wrapped.groupId>
+    <wrapped.artifactId>prefuse</wrapped.artifactId>
+    <wrapped.version>beta-20060220</wrapped.version>
+    <bundle.version>2006.02.20</bundle.version>
+  </properties>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>cishell.libs</groupId>
+  <artifactId>org.prefuse</artifactId>
+  <version>beta-20060220-001-SNAPSHOT</version>
+
+  <name>${bundle.symbolicName} ${wrapped.version} [osgi]</name>
+
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>${wrapped.groupId}</groupId>
+      <artifactId>${wrapped.artifactId}</artifactId>
+      <version>${wrapped.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+</project>

Modified: branches/tycho/libs/pom.xml
===================================================================
--- branches/tycho/libs/pom.xml	2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/libs/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -51,6 +51,8 @@
     <module>commons-collections</module>
     <module>colt</module>
     <module>concurrent</module>
+    <module>com.google.collections</module>
+    <module>org.prefuse</module>
   </modules>
 
   <build>
@@ -82,4 +84,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: branches/tycho/libs/poms/wrappers/pom.xml
===================================================================
--- branches/tycho/libs/poms/wrappers/pom.xml	2010-11-14 09:49:25 UTC (rev 1160)
+++ branches/tycho/libs/poms/wrappers/pom.xml	2010-11-14 10:49:19 UTC (rev 1161)
@@ -13,6 +13,10 @@
 
   <name>libs - wrapper instructions</name>
 
+  <properties>
+    <bundle.version>${wrapped.version}</bundle.version>
+  </properties>
+
   <!--
    | don't apply project details to wrapped jars
   -->
@@ -37,7 +41,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-            <Bundle-Version>${wrapped.version}</Bundle-Version>
+            <Bundle-Version>${bundle.version}</Bundle-Version>
             <!--
              | export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
             -->


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


