diff options
| author | slewis | 2014-04-30 22:38:30 +0000 |
|---|---|---|
| committer | slewis | 2014-04-30 22:38:30 +0000 |
| commit | 74fde0db9fbfedc833bbd0f37fb62464828e5088 (patch) | |
| tree | ebca67e4a2aefcde269285c965779a215f0d2556 /tests | |
| parent | d62a2788205625e63c4816323f71edbb2232fe07 (diff) | |
| parent | a0a0ad4c42bcb6cedfa5d990666b24893f475845 (diff) | |
| download | org.eclipse.ecf-74fde0db9fbfedc833bbd0f37fb62464828e5088.tar.gz org.eclipse.ecf-74fde0db9fbfedc833bbd0f37fb62464828e5088.tar.xz org.eclipse.ecf-74fde0db9fbfedc833bbd0f37fb62464828e5088.zip | |
Merge remote-tracking branch 'origin/master' into rfc1.1
Conflicts:
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointDescription$1.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointDescription$UnmodifiableDictionary.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointDescription.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointListener.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointPermission.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/EndpointPermissionCollection.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/ExportReference.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/ExportRegistration.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/ImportReference.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/ImportRegistration.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/RemoteServiceAdmin.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/RemoteServiceAdminEvent.class
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/org/osgi/service/remoteserviceadmin/RemoteServiceAdminListener.class
Change-Id: Id7826f6ef093506da29859dd61138637d5efdf9e
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bundles/org.eclipse.ecf.tests.provider.discovery/org.eclipse.ecf.tests.provider.discovery.launch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/org.eclipse.ecf.tests.provider.discovery.launch b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/org.eclipse.ecf.tests.provider.discovery.launch index 09014eff0..656f65845 100644 --- a/tests/bundles/org.eclipse.ecf.tests.provider.discovery/org.eclipse.ecf.tests.provider.discovery.launch +++ b/tests/bundles/org.eclipse.ecf.tests.provider.discovery/org.eclipse.ecf.tests.provider.discovery.launch @@ -30,7 +30,7 @@ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.tests.provider.discovery"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -Dnet.mdns.port=65353 -Dnet.mdns.interface=127.0.0.1 -Dnet.slp.port=65427 -Dnet.slp.interfaces=127.0.0.1 -Dnet.slp.rediscover=15000 -Dch.ethz.iks.slp.debug=false -Dnet.slp.traceDATraffic=false -Dnet.slp.traceMsg=false -Dnet.slp.traceDrop=false -Dnet.slp.traceReg=false -Dnet.slp.failercount=3 -Dnet.slp.multicastTimeouts=10,25,50,100,250,500,1000 -Dnet.slp.multicastMaximumWait=2000"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -Dnet.mdns.port=65353 -Dnet.mdns.interface=127.0.0.1 -Dnet.slp.port=65427 -Dnet.slp.interfaces=127.0.0.1 -Dnet.slp.rediscover=15000 -Dch.ethz.iks.slp.debug=false -Dnet.slp.traceDATraffic=false -Dnet.slp.traceMsg=false -Dnet.slp.traceDrop=false -Dnet.slp.traceReg=false -Dnet.slp.failercount=3 -Dnet.slp.multicastTimeouts=10,25,50,100,250,500,1000 -Dnet.slp.multicastMaximumWait=2000"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> |