summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Campo2008-05-05 06:04:20 (EDT)
committerChristian Campo2008-05-05 06:04:20 (EDT)
commitd6dee9e844bc667b866e33c9e63895092b343fad (patch)
treef6700b73e75a8af11da5c879bc356289d6ea56d0
parentfdc6179fcaf34183f4f5e65a28fd34b4d52dbb5f (diff)
downloadorg.eclipse.riena-d6dee9e844bc667b866e33c9e63895092b343fad.zip
org.eclipse.riena-d6dee9e844bc667b866e33c9e63895092b343fad.tar.gz
org.eclipse.riena-d6dee9e844bc667b866e33c9e63895092b343fad.tar.bz2
changes for M2 build
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.client.config/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.client/build.properties3
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.server/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch2
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.server/build.properties3
-rw-r--r--org.eclipse.riena.sample.app.server/build.properties3
7 files changed, 13 insertions, 8 deletions
diff --git a/org.eclipse.riena.communication.sample.pingpong.client.config/META-INF/MANIFEST.MF b/org.eclipse.riena.communication.sample.pingpong.client.config/META-INF/MANIFEST.MF
index c368dbd..07409b5 100644
--- a/org.eclipse.riena.communication.sample.pingpong.client.config/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.communication.sample.pingpong.client.config/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.M2
Bundle-Activator: org.eclipse.riena.internal.communication.sample.pingpong.client.config.Activator
Eclipse-LazyStart: true
Import-Package: org.osgi.framework;version="1.4.0"
-Require-Bundle: org.eclipse.riena.communication.core,
- org.eclipse.riena.communication.sample.pingpong.common,
- org.eclipse.riena.core
+Require-Bundle: org.eclipse.riena.communication.sample.pingpong.common,
+ org.eclipse.riena.core,
+ org.eclipse.riena.client;bundle-version="1.0.0"
diff --git a/org.eclipse.riena.communication.sample.pingpong.client/build.properties b/org.eclipse.riena.communication.sample.pingpong.client/build.properties
index 34d2e4d..afa0565 100644
--- a/org.eclipse.riena.communication.sample.pingpong.client/build.properties
+++ b/org.eclipse.riena.communication.sample.pingpong.client/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ Riena Sample PingPong Client.launch
diff --git a/org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF b/org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF
index 80e1f1b..e96668e 100644
--- a/org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.riena.communication.sample.pingpong.common
Bundle-Version: 1.0.0.M2
Eclipse-RegisterBuddy: org.eclipse.riena.communication.core
Export-Package: org.eclipse.riena.communication.sample.pingpong.common
-Require-Bundle: org.eclipse.riena.communication.core
+Require-Bundle: org.eclipse.riena.client;bundle-version="1.0.0"
diff --git a/org.eclipse.riena.communication.sample.pingpong.server/META-INF/MANIFEST.MF b/org.eclipse.riena.communication.sample.pingpong.server/META-INF/MANIFEST.MF
index 0e754b8..69c28be 100644
--- a/org.eclipse.riena.communication.sample.pingpong.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.communication.sample.pingpong.server/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: Riena Communication Sample Ping Pong Server (Incubation)
Bundle-SymbolicName: org.eclipse.riena.communication.sample.pingpong.server
Bundle-Version: 1.0.0.M2
Require-Bundle: org.eclipse.riena.communication.sample.pingpong.common,
- org.eclipse.riena.communication.core
+ org.eclipse.riena.server;bundle-version="1.0.0"
Bundle-Activator: org.eclipse.riena.internal.communication.sample.pingpong.server.Activator
Import-Package: org.osgi.framework;version="1.4.0"
diff --git a/org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch b/org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch
index 8c4a7a2..9653411 100644
--- a/org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch
+++ b/org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch
@@ -11,10 +11,12 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk5"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -clean"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.equinox.http.jetty.http.port=8080"/>
<stringAttribute key="pde.version" value="3.3"/>
+<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="javax.servlet@default:default,org.apache.commons.logging@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.mortbay.jetty@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
diff --git a/org.eclipse.riena.communication.sample.pingpong.server/build.properties b/org.eclipse.riena.communication.sample.pingpong.server/build.properties
index 34d2e4d..94eb9e5 100644
--- a/org.eclipse.riena.communication.sample.pingpong.server/build.properties
+++ b/org.eclipse.riena.communication.sample.pingpong.server/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ Riena Sample PingPong Server.launch
diff --git a/org.eclipse.riena.sample.app.server/build.properties b/org.eclipse.riena.sample.app.server/build.properties
index e9863e2..13dd370 100644
--- a/org.eclipse.riena.sample.app.server/build.properties
+++ b/org.eclipse.riena.sample.app.server/build.properties
@@ -2,4 +2,5 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ Riena Sample App Server.launch