diff options
author | Eike Stepper | 2007-08-28 08:36:11 +0000 |
---|---|---|
committer | Eike Stepper | 2007-08-28 08:36:11 +0000 |
commit | f6ad99d58e45b2a67c882e69be22eb8ffaa71f03 (patch) | |
tree | 83828522b79d3852fa447dc6b272eec8a2c8dbb0 /plugins | |
parent | 45a9e1f93a178aad0cc81f4239aac27996fcb9c3 (diff) | |
download | cdo-f6ad99d58e45b2a67c882e69be22eb8ffaa71f03.tar.gz cdo-f6ad99d58e45b2a67c882e69be22eb8ffaa71f03.tar.xz cdo-f6ad99d58e45b2a67c882e69be22eb8ffaa71f03.zip |
*** empty log message ***
Diffstat (limited to 'plugins')
9 files changed, 33 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch index 79efb608a4..8ca321771a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch +++ b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch @@ -154,7 +154,7 @@ <mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/> <mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/> -<mapEntry key="org.eclipse.net4j/debug.buffer" value="true"/> +<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/> <mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/> @@ -432,7 +432,7 @@ <mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/> <mapEntry key="org.eclipse.jet/debug/xpath/compilations" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.control" value="800"/> -<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="true"/> +<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/> <mapEntry key="org.eclipse.ui/perf/uijob" value="200"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/> diff --git a/plugins/org.eclipse.emf.cdo.ui/DerbyServer start.launch b/plugins/org.eclipse.emf.cdo.ui/DerbyServer start.launch new file mode 100644 index 0000000000..cdedad465e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui/DerbyServer start.launch @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="derby.system.home" value="/temp"/> +</mapAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\develop\lib\db-derby-10.3.1.4-bin\bin\startNetworkServer.bat"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="C:\temp"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.ui/DerbyServer stop.launch b/plugins/org.eclipse.emf.cdo.ui/DerbyServer stop.launch new file mode 100644 index 0000000000..46b177557e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui/DerbyServer stop.launch @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType"> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="derby.system.home" value="/temp"/> +</mapAttribute> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\develop\lib\db-derby-10.3.1.4-bin\bin\stopNetworkServer.bat"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="C:\temp"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml b/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml index 82f03c2e9e..affa21748c 100644 --- a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml +++ b/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml @@ -25,9 +25,13 @@ <!-- name: <any user-contributed DBAdapter name> --> <dbAdapter name="derby"/> - <dataSource + <!-- <dataSource driverClass="org.apache.derby.jdbc.EmbeddedDataSource" databaseName="/temp/cdodb1" + createDatabase="create"/> --> + <dataSource + driverClass="org.apache.derby.jdbc.ClientDataSource" + databaseName="cdodb1" createDatabase="create"/> </store> </repository> diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml index b7b53ea585..4b116e1644 100644 --- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml @@ -5,9 +5,10 @@ <!-- <extension point="org.eclipse.net4j.util.elementProcessors"> - <elementProcessor class="org.eclipse.emf.cdo.protocol.util.CDOXORStreamWrapperInjector"/> + <elementProcessor class="org.eclipse.emf.cdo.protocol.util.CDOGZIPStreamWrapperInjector"/> </extension> --> + <extension point="org.eclipse.ui.views"> <category diff --git a/plugins/org.eclipse.net4j.db.derby/.classpath b/plugins/org.eclipse.net4j.db.derby/.classpath index 12a719f13f..c64b7c8618 100644 --- a/plugins/org.eclipse.net4j.db.derby/.classpath +++ b/plugins/org.eclipse.net4j.db.derby/.classpath @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry exported="true" kind="lib" path="lib/derby.jar"/> + <classpathentry exported="true" kind="lib" path="lib/derbyclient.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF index 815dd3b1f7..f7733f1c6e 100644 --- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF @@ -7,5 +7,6 @@ Bundle-Vendor: %providerName Fragment-Host: org.eclipse.net4j.db;bundle-version="0.8.0" Require-Bundle: org.eclipse.core.runtime Bundle-ClassPath: ., - lib/derby.jar + lib/derby.jar, + lib/derbyclient.jar Export-Package: org.apache.derby.jdbc;x-friends:="org.eclipse.emf.cdo.tests.tdd" diff --git a/plugins/org.eclipse.net4j.db.derby/build.properties b/plugins/org.eclipse.net4j.db.derby/build.properties index 3943df1daa..1f28596c28 100644 --- a/plugins/org.eclipse.net4j.db.derby/build.properties +++ b/plugins/org.eclipse.net4j.db.derby/build.properties @@ -8,5 +8,5 @@ bin.includes = META-INF/,\ epl-v10.html,\ license.html,\ fragment.properties,\ - lib/,\ - fragment.xml + fragment.xml,\ + lib/ diff --git a/plugins/org.eclipse.net4j.db.derby/lib/NOTICE b/plugins/org.eclipse.net4j.db.derby/lib/NOTICE index 9a786f9dc6..563d7af8a1 100644 --- a/plugins/org.eclipse.net4j.db.derby/lib/NOTICE +++ b/plugins/org.eclipse.net4j.db.derby/lib/NOTICE @@ -4,7 +4,7 @@ ========================================================================= Apache Derby -Copyright 2004-2006 The Apache Software Foundation +Copyright 2004-2007 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). |