summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Campo2008-05-05 11:48:06 (EDT)
committerChristian Campo2008-05-05 11:48:06 (EDT)
commitaba1062e6164b15a1c12d7f504dfcd3ef538dbe6 (patch)
treec37b7964328cfece49cd07b990ff2eb88d3d213c
parentd6dee9e844bc667b866e33c9e63895092b343fad (diff)
downloadorg.eclipse.riena-aba1062e6164b15a1c12d7f504dfcd3ef538dbe6.zip
org.eclipse.riena-aba1062e6164b15a1c12d7f504dfcd3ef538dbe6.tar.gz
org.eclipse.riena-aba1062e6164b15a1c12d7f504dfcd3ef538dbe6.tar.bz2
minor tweaks for M2
-rw-r--r--org.eclipse.riena.client/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.client/Riena Sample PingPong Client.launch11
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.common/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.riena.communication.sample.pingpong.server/Riena Sample PingPong Server.launch8
-rw-r--r--org.eclipse.riena.server/META-INF/MANIFEST.MF2
5 files changed, 11 insertions, 15 deletions
diff --git a/org.eclipse.riena.client/META-INF/MANIFEST.MF b/org.eclipse.riena.client/META-INF/MANIFEST.MF
index de8f3c4..7b49486 100644
--- a/org.eclipse.riena.client/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.client/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Require-Bundle: org.eclipse.riena.communication.console;bundle-version="1.0.0";v
org.eclipse.riena.communication.core;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.riena.communication.factory.hessian;bundle-version="1.0.0",
org.eclipse.riena.core;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.riena.security.client.startup;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.riena.security.common;bundle-version="1.0.0";visibility:=reexport,
com.caucho.hessian;bundle-version="3.1.3";visibility:=reexport
Eclipse-RegisterBuddy: org.eclipse.riena.communication.core
+Eclipse-BuddyPolicy: registered
diff --git a/org.eclipse.riena.communication.sample.pingpong.client/Riena Sample PingPong Client.launch b/org.eclipse.riena.communication.sample.pingpong.client/Riena Sample PingPong Client.launch
index 0cdf58e..35fc9f8 100644
--- a/org.eclipse.riena.communication.sample.pingpong.client/Riena Sample PingPong Client.launch
+++ b/org.eclipse.riena.communication.sample.pingpong.client/Riena Sample PingPong Client.launch
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Riena Sample PingPong Client"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="4"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.spaces.core,de.compeople.scp.offline.common,org.eclipse.core.filesystem,de.compeople.scp.client,de.compeople.scp.ui.swing,sample.canvas,de.compeople.scp.offline.xstream.gzip,org.eclipse.swt.nebula.tests,de.compeople.scp.offline.xstream.gzipcrypt,org.eclipse.riena.communication.discovery,org.eclipse.riena.communication.publisher.xfire,org.eclipse.swt.nebula,org.eclipse.nebula.jface.gridviewer,org.eclipse.spaces.provider.local,org.eclipse.nebula.widgets.grid,org.eclipse.spaces.core.test,org.eclipse.riena.communication.factory.xfire,org.eclipse.riena.security.common,org.eclipse.riena.navigation.ui.swt,org.eclipse.riena.sample.app.server,org.eclipse.riena.sample.app.common,com.hexapixel,org.eclipse.nebula.widgets.ganttchart,org.eclipse.riena.security.simpleservices,org.eclipse.nebula.widgets.collapsiblebuttons,de.compeople.scp.offline.xstream.xml,de.compeople.scp.navigation.ui.swing,de.compeople.scp.ui.ridgets.swing,org.eclipse.riena.navigation.ui.swt.win32,org.eclipse.riena.ui.tests,org.eclipse.spaces.filesystem.xdrive.ui,org.junit4,org.eclipse.swt.nebula.snippets,org.eclipse.spaces.ui,org.eclipse.riena.tests,org.eclipse.nebula.widgets.calendarcombo,de.compeople.scp.example.client,org.eclipse.riena.navigation,org.eclipse.spaces,de.compeople.scp.offline.jserialization,org.eclipse.riena.exceptionhandler,org.eclipse.spaces.osgi.test,org.eclipse.nebula.widgets.ctree,org.eclipse.riena.communication.console,org.eclipse.riena.security.common.bootpolicy,org.eclipse.spaces.osgi.ui,org.eclipse.spaces.ftpAdapterSample,org.eclipse.riena.communication.sample.pingpong.server,org.eclipse.spaces.provider.xdrive.test,org.codehaus.xfire,de.compeople.scp.sample.app.client,org.eclipse.riena.ui.swt,org.eclipse.nebula.widgets.gallery,sample.render,org.eclipse.spaces.provider.xdrive,org.eclipse.riena.security.client.startup,org.eclipse.riena.sample.app.client.mail,org.eclipse.swt.nebula.nebface,org.eclipse.swt.nebula.presentations.shelf,org.eclipse.nebula.widgets.pshelf,org.eclipse.riena.communication.publisher,org.eclipse.core.filesystem.macosx,org.eclipse.spaces.test,org.eclipse.nebula.widgets.pgroup,org.eclipse.riena.sample.app.client,de.compeople.scp.example.common,org.eclipse.riena.communication.publisher.hessian,org.eclipse.swt.nebula.examples,org.eclipse.riena.navigation.ui.swt.macosx,de.compeople.scp.ui.swing.lnf.default,org.junit,org.eclipse.riena.ui.ridgets.swt,org.eclipse.riena.ui.core,org.eclipse.riena.navigation.ui,org.eclipse.riena.example.client,org.eclipse.spaces.osgi,org.eclipse.nebula.widgets.datechooser,org.eclipse.nebula.widgets.formattedtext,com.jgoodies,org.eclipse.nebula.widgets.cdatetime,com.thoughworks.xstream,org.eclipse.spaces.localFileAdapter,org.eclipse.equinox.servletbridge,de.compeople.scp.offline.xstream,de.compeople.scp.tests,org.eclipse.riena.security.services,org.eclipse.spaces.filesystem.xdrive,org.eclipse.riena.security.server,org.eclipse.riena.ui.ridgets,org.eclipse.riena.objecttransaction,org.eclipse.riena.exceptionmanager,org.eclipse.spaces.ui.test,de.compeople.scp.objecttransaction"/>
<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.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/>
+<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"/>
@@ -21,5 +20,5 @@
<stringAttribute key="target_bundles" value="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.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="com.caucho.hessian@default:default,javax.servlet@default:default,org.apache.log4j@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.log@default:default,org.eclipse.osgi@:,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.communication.sample.pingpong.client@default:default,org.eclipse.riena.communication.sample.pingpong.client.config@default:default,org.eclipse.riena.communication.sample.pingpong.common@default:default,org.eclipse.riena.core@default:default"/>
+<stringAttribute key="workspace_bundles" value="com.caucho.hessian@default:default,javax.servlet@default:default,org.apache.log4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.log@default:default,org.eclipse.osgi@:,org.eclipse.riena.client@default:default,org.eclipse.riena.communication.console@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.communication.sample.pingpong.client@default:default,org.eclipse.riena.communication.sample.pingpong.client.config@default:default,org.eclipse.riena.communication.sample.pingpong.common@default:default,org.eclipse.riena.core@default:default"/>
</launchConfiguration>
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 e96668e..c02f73a 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
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: Riena Communication Sample PingPong Common (Incubation)
Bundle-SymbolicName: org.eclipse.riena.communication.sample.pingpong.common
Bundle-Version: 1.0.0.M2
-Eclipse-RegisterBuddy: org.eclipse.riena.communication.core
+Eclipse-RegisterBuddy: org.eclipse.riena.client
Export-Package: org.eclipse.riena.communication.sample.pingpong.common
Require-Bundle: org.eclipse.riena.client;bundle-version="1.0.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 9653411..0babe02 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
@@ -2,10 +2,10 @@
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearConfig" value="true"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Riena Sample PingPong Server"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="4"/>
@@ -17,8 +17,8 @@
<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"/>
+<stringAttribute key="target_bundles" value="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.services@default:default,org.mortbay.jetty@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="com.caucho.hessian@default:default,org.apache.log4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.log@default:default,org.eclipse.riena.communication.console@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.communication.publisher@default:default,org.eclipse.riena.communication.publisher.hessian@default:default,org.eclipse.riena.communication.sample.pingpong.common@default:default,org.eclipse.riena.communication.sample.pingpong.server@default:default,org.eclipse.riena.core@default:default"/>
+<stringAttribute key="workspace_bundles" value="com.caucho.hessian@default:default,javax.servlet@default:default,org.apache.log4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.log@default:default,org.eclipse.osgi@:,org.eclipse.riena.client@default:default,org.eclipse.riena.communication.console@default:default,org.eclipse.riena.communication.core@default:default,org.eclipse.riena.communication.factory.hessian@default:default,org.eclipse.riena.communication.publisher@default:default,org.eclipse.riena.communication.publisher.hessian@default:default,org.eclipse.riena.communication.sample.pingpong.common@default:default,org.eclipse.riena.communication.sample.pingpong.server@default:default,org.eclipse.riena.core@default:default,org.eclipse.riena.server@default:default"/>
</launchConfiguration>
diff --git a/org.eclipse.riena.server/META-INF/MANIFEST.MF b/org.eclipse.riena.server/META-INF/MANIFEST.MF
index ea835fb..2369b3c 100644
--- a/org.eclipse.riena.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.riena.server/META-INF/MANIFEST.MF
@@ -9,8 +9,6 @@ Require-Bundle: org.eclipse.riena.communication.console;bundle-version="1.0.0";v
org.eclipse.riena.communication.publisher;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.riena.communication.publisher.hessian;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.riena.core;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.riena.security.common;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.riena.security.server;bundle-version="1.0.0";visibility:=reexport,
com.caucho.hessian;bundle-version="3.1.3";visibility:=reexport,
org.eclipse.riena.communication.factory.hessian;bundle-version="1.0.0";visibility:=reexport
Eclipse-RegisterBuddy: org.eclipse.riena.communication.core