modifying target platform and pom.xml to accomodate incompatible Franca versioning scheme

7 files changed, 57 insertions, 40 deletions

diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..47c8c9a
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,19 @@
+
+This is CommonAPI-Tools 2.1.6
+
+Changes since 2.1.5
+
+- modifying target platform and pom.xml to accomodate incompatible Franca versioning scheme
+- Improved description for maven build of update-site and commandline generator.
+- adding dbus.validator to category.xml
+- extend and restructure documentation with tutorial and specification
+- added O0 optimization flag to CMakeLists.txt.
+- added generation of code for disambiguation needed for attributes on inherited interfaces
+- adding maven xtend plugin for command line build
+- genallincl bug in cli fixed
+- removing obsolete plugins to shrink down size of generator
+- adapted Test "DBusCommunicationTest > RemoteMethodCallSucceeds" to verification test.
+- deleted the old validator, added a validator with general restrictions
+- new feature to generate proxies and stubs into seperate target directories
+- small changes to generate code that can be compiled warning free
+- generator now creates windows compatible code
diff --git a/org.genivi.commonapi.core.feature/category.xml b/org.genivi.commonapi.core.feature/category.xml
deleted file mode 100644
index 5e408ca..0000000
--- a/org.genivi.commonapi.core.feature/category.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.genivi.commonapi.core.feature_2.1.4.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.1.4.qualifier">
-      <category name="GENIVI CommonAPI"/>
-   </feature>
-   <feature url="features/org.genivi.commonapi.core.validator.feature_2.1.4.qualifier.jar" id="org.genivi.commonapi.core.validator.feature" version="2.1.4.qualifier">
-      <category name="GENIVI CommonAPI"/>
-   </feature>
-   <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">
-      <description>
-         The basic generator for all CommonAPI compliant middleware libraries. Creates all source code that needs to adhere the specification. Any specific middleware code is generated by seperate generators, in seperate files.
-      </description>
-   </category-def>
-</site>
diff --git a/org.genivi.commonapi.core/.classpath b/org.genivi.commonapi.core/.classpath
index d08eb39..281e1c2 100644
--- a/org.genivi.commonapi.core/.classpath
+++ b/org.genivi.commonapi.core/.classpath
@@ -6,5 +6,6 @@
 	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="lib" exported="true" path="lib/guava-14.0.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.genivi.commonapi.core/META-INF/MANIFEST.MF b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
index 6be463a..8d111fe 100644
--- a/org.genivi.commonapi.core/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
@@ -13,10 +13,9 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0",
  org.eclipse.xtext.builder;bundle-version="2.4.0",
  org.franca.core.dsl;bundle-version="0.8.9",
  org.franca.deploymodel.dsl;bundle-version="0.8.9",
- org.eclipse.jface,
- com.google.guava;bundle-version="15.0.0"
+ org.eclipse.jface
 Import-Package: javax.inject;version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.genivi.commonapi.core.deployment,org.genivi.common
  api.core.generator, org.genivi.commonapi.core.preferences
-Bundle-ClassPath: .
+Bundle-ClassPath: .,lib/guava-14.0.1.jar
diff --git a/org.genivi.commonapi.core/README b/org.genivi.commonapi.core/README
new file mode 100644
index 0000000..7f6dbbf
--- /dev/null
+++ b/org.genivi.commonapi.core/README
@@ -0,0 +1,4 @@
+To write source code for the CommonAPI-Tools and to compile them, please download
+guava-14.0.1.jar from
+http://search.maven.org/remotecontent?filepath=com/google/guava/guava/14.0.1/guava-14.0.1.jar
+and put it into a folder called "lib" in the project root directory.
\ No newline at end of file
diff --git a/org.genivi.commonapi.parent.releng/pom.xml b/org.genivi.commonapi.parent.releng/pom.xml
index 5f161c6..fcdf731 100644
--- a/org.genivi.commonapi.parent.releng/pom.xml
+++ b/org.genivi.commonapi.parent.releng/pom.xml
@@ -12,18 +12,29 @@
         <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
         <xtend-version>2.4.3</xtend-version>
     </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>15.0</version>
-        </dependency>
-    </dependencies>
+    
+     <pluginRepositories>    
+        <pluginRepository>
+            <id>sonatype</id>
+            <url>http://repository.sonatype.org/content/groups/sonatype-public-grid/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+<!--        <pluginRepository>
+            <id>xtend</id>
+            <url>http://build.eclipse.org/common/xtend/maven/</url>
+        </pluginRepository> -->
+    </pluginRepositories>  
+    
     <repositories>
         <repository>
             <id>dbus-emf</id>
             <layout>p2</layout>
-            <url>http://dbus-emf-model.eclipselabs.org.codespot.com/git/update_site/releases/</url>
+            <url>http://dbus-emf-model.eclipselabs.org.codespot.com/git/update_site/releases/0.7.8</url>
         </repository>
         <repository>
             <id>eclipse-updates</id>
@@ -38,12 +49,12 @@
         <repository>
             <id>Franca</id>
             <layout>p2</layout>
-            <url>http://franca.eclipselabs.org.codespot.com/git/update_site/releases/</url>
+            <url>http://franca.eclipselabs.org.codespot.com/git/update_site/releases/0.8.10</url>
         </repository>
         <repository>
-            <id>Orbit</id>
+            <id>xtext</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/tools/orbit/downloads/drops/S20140428023358/repository/</url>
+            <url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</url>
         </repository>
     </repositories>
     <build>
@@ -126,7 +137,7 @@
             <plugin>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>xtend-maven-plugin</artifactId>
-                <version>${xtend-version}</version>
+                <version>${xtend-version}</version> 
                 <executions>
                     <execution>
                         <goals>
diff --git a/org.genivi.commonapi.target/org.genivi.commonapi.target.target b/org.genivi.commonapi.target/org.genivi.commonapi.target.target
index 3059d0e..480ce21 100644
--- a/org.genivi.commonapi.target/org.genivi.commonapi.target.target
+++ b/org.genivi.commonapi.target/org.genivi.commonapi.target.target
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Common API" sequenceNumber="19">
+<?pde version="3.8"?><target name="Common API" sequenceNumber="22">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="4.3.1.M20130911-1000"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.3/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xtext.sdk.feature.group" version="2.4.3.v201309030823"/>
 <unit id="org.eclipse.cdt.sdk.feature.group" version="8.2.1.201309180223"/>
 <repository location="http://download.eclipse.org/releases/kepler"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="model.emf.dbusxml.feature.feature.group" version="0.7.8.201401151351"/>
-<repository location="http://dbus-emf-model.eclipselabs.org.codespot.com/git/update_site/releases/"/>
+<unit id="org.eclipse.platform.sdk" version="4.3.1.M20130911-1000"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.3/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.franca.dbus.feature.sdk.feature.group" version="0.8.10.201309262002"/>
-<unit id="org.franca.feature.sdk.feature.group" version="0.8.10.201309262002"/>
+<unit id="org.franca.dbus.feature.feature.group" version="0.8.10.201309262002"/>
 <unit id="org.franca.feature.feature.group" version="0.8.10.201309262002"/>
-<repository location="http://franca.eclipselabs.org.codespot.com/git/update_site/releases/"/>
+<unit id="org.franca.feature.sdk.feature.group" version="0.8.10.201309262002"/>
+<repository location="http://franca.eclipselabs.org.codespot.com/git/update_site/releases/0.8.10"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="com.google.guava" version="15.0.0.v201403281430"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20140428023358/repository/"/>
+<unit id="model.emf.dbusxml.feature.feature.group" version="0.7.8.201401151351"/>
+<repository location="http://dbus-emf-model.eclipselabs.org.codespot.com/git/update_site/releases/0.7.8"/>
 </location>
 </locations>
 </target>