Permalink
Browse files

upfitted tycho build, v0.15.0, EMF model plugins built by maven now

using remote/standard p2 repositories and target def only
reconciled dependencies within master project
updated Texo pojos and exported package
maven builds work

still have a compile problem, due to halfway through replacing jersey
with spring mvc for rest controllers
  • Loading branch information...
1 parent eb451fc commit 44807a3d4d276af476411e72621c170b29c116ea @gregjan committed Aug 7, 2012
Showing with 820 additions and 356 deletions.
  1. +3 −3 game-model/.classpath
  2. +3 −3 game-model/.settings/org.eclipse.jdt.core.prefs
  3. +5 −4 game-model/META-INF/MANIFEST.MF
  4. +4 −3 game-model/build.properties
  5. +5 −7 game-model/model/games.genmodel
  6. +3 −20 game-model/pom.xml
  7. +27 −27 game-model/{src/texo/java → src-gen}/com/meekmok/games/Game.java
  8. +2 −4 game-model/{src/texo/java → src-gen}/com/meekmok/games/Games.ecore
  9. +69 −62 game-model/{src/texo/java → src-gen}/com/meekmok/games/GamesModelFactory.java
  10. +98 −89 game-model/{src/texo/java → src-gen}/com/meekmok/games/GamesModelPackage.java
  11. +21 −19 game-model/{src/texo/java → src-gen}/com/meekmok/games/Player.java
  12. +52 −49 game-model/{src/texo/java → src-gen}/com/meekmok/games/Profile.java
  13. +28 −27 game-model/{src/texo/java → src-gen}/com/meekmok/games/Profiles.java
  14. +61 −8 pom.xml
  15. +1 −1 warmok-model/.classpath
  16. +3 −3 warmok-model/.settings/org.eclipse.jdt.core.prefs
  17. +7 −4 warmok-model/META-INF/MANIFEST.MF
  18. +0 −1 warmok-model/build.properties
  19. +4 −22 warmok-model/pom.xml
  20. +15 −0 webapp/.classpath
  21. +42 −0 webapp/.project
  22. +12 −0 webapp/.settings/.jsdtscope
  23. +9 −0 webapp/.settings/org.eclipse.jdt.core.prefs
  24. +10 −0 webapp/.settings/org.eclipse.wst.common.component
  25. +8 −0 webapp/.settings/org.eclipse.wst.common.project.facet.core.xml
  26. +1 −0 webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container
  27. +1 −0 webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name
  28. +8 −0 webapp/.settings/org.maven.ide.eclipse.prefs
  29. +90 −0 webapp/pom.xml
  30. +136 −0 webapp/src/main/java/org/meekmok/warmok/dao/ProfileDao.java
  31. +68 −0 webapp/src/main/java/org/meekmok/warmok/rest/ProfileRestController.java
  32. +19 −0 webapp/src/main/webapp/WEB-INF/web.xml
  33. +5 −0 webapp/src/main/webapp/index.jsp
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="src" path="src/texo/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src-gen"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
@@ -1,16 +1,17 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: Games_Model;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-SymbolicName: game-model;singleton:=true
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.texo;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.emf.texo.xml;bundle-version="0.1.0";visibility:=reexport
-Export-Package: org.meekmok.Games,
+Export-Package: com.meekmok.games,
+ org.meekmok.Games,
org.meekmok.Games.impl,
org.meekmok.Games.util
@@ -10,6 +10,7 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
-source.. = src/main/java/,src/texo/java
-output.. = target/classes
-jre.compilation.profile = J2SE-1.5
+source.. = src/main/java/,\
+ src-gen/
+output.. = target/classes,\
+ bin/
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/Games Model/src/main/java"
- editDirectory="/Games Model.edit/src/main/java" modelPluginID="Games_Model" modelName="Games"
- testsDirectory="/Games Model.tests/src/main/java" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/Games Model/src/main/java" editDirectory="/Games Model.edit/src/main/java"
+ modelPluginID="Games_Model" modelName="Games" testsDirectory="/Games Model.tests/src/main/java"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
<foreignModel>games.ecore</foreignModel>
- <genPackages prefix="Games" basePackage="org.meekmok" disposableProviderFactory="true"
+ <genPackages prefix="Games" basePackage="com.meekmok" disposableProviderFactory="true"
ecorePackage="games.ecore#/">
<genClasses ecoreClass="games.ecore#//Profile">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute games.ecore#//Profile/name"/>
View
@@ -2,29 +2,12 @@
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>
<artifactId>game-model</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>${tycho-groupid}</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>${tycho-groupid}</groupId>
- <artifactId>maven-osgi-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <packaging>eclipse-plugin</packaging>
<parent>
<groupId>com.meekmok</groupId>
<artifactId>warmok</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
+ <name>Games Model</name>
</project>
@@ -3,26 +3,26 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * A representation of the model object '<em><b>Game</b></em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+/**
+ * A representation of the model object '<em><b>Game</b></em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
*/
public class Game {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
*/
private List<Player> players = new ArrayList<Player>();
/**
* Returns the value of '<em><b>players</b></em>' feature.
- *
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return the value of '<em><b>players</b></em>' feature
* @generated
*/
@@ -32,20 +32,18 @@
/**
* Adds to the <em>players</em> feature.
+ *
* @generated
*/
public void addToPlayers(Player playersValue) {
-
if (!players.contains(playersValue)) {
-
players.add(playersValue);
-
}
-
}
- /**
+ /**
* Removes from the <em>players</em> feature.
+ *
* @generated
*/
public void removeFromPlayers(Player playersValue) {
@@ -54,32 +52,34 @@ public void removeFromPlayers(Player playersValue) {
}
}
- /**
+ /**
* Clears the <em>players</em> feature.
+ *
* @generated
*/
public void clearPlayers() {
- for (Player playersElement : players) {
- removeFromPlayers(playersElement);
+ while (!players.isEmpty()) {
+ removeFromPlayers(players.iterator().next());
}
}
/**
* Sets the '{@link Game#getPlayers() <em>players</em>}' feature.
- *
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param the new value of the '{@link Game#getPlayers() players}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param the
+ * new value of the '{@link Game#getPlayers() players}' feature.
* @generated
*/
public void setPlayers(List<Player> newPlayers) {
players = newPlayers;
}
/**
- * A toString method which prints the values of all EAttributes of this instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * A toString method which prints the values of all EAttributes of this
+ * instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Games"
- nsURI="http://www.meekmok.com/Games" nsPrefix="games">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Games" nsURI="http://www.meekmok.com/Games" nsPrefix="games">
<eClassifiers xsi:type="ecore:EClass" name="Profile">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
Oops, something went wrong.

0 comments on commit 44807a3

Please sign in to comment.