summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-31 14:34:43 (EDT)
committerEike Stepper2007-08-31 14:34:43 (EDT)
commitd82dfa6f227074aade05227a257ac913bdde7931 (patch)
tree941361d7b86439055eb476eb9be589ff26d5eb85
parent7d1ec9d38e8a20dcdf531f8905966feff04fa1bb (diff)
downloadcdo-d82dfa6f227074aade05227a257ac913bdde7931.zip
cdo-d82dfa6f227074aade05227a257ac913bdde7931.tar.gz
cdo-d82dfa6f227074aade05227a257ac913bdde7931.tar.bz2
[201839] Net4j/CDO Components must comform to incubation rules
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201839
-rw-r--r--plugins/org.eclipse.emf.cdo.server/plugin.xml13
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java45
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs53
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java20
4 files changed, 69 insertions, 62 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml
index dbaab11..df78c98 100644
--- a/plugins/org.eclipse.emf.cdo.server/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml
@@ -20,12 +20,14 @@
<extension-point id="storeFactories" name="CDO Store Factories" schema="schema/storeFactories.exsd"/>
<extension-point id="repositoryFactories" name="CDO Repository Factories" schema="schema/repositoryFactories.exsd"/>
- <extension point="org.eclipse.net4j.util.factories">
+ <extension
+ point="org.eclipse.net4j.util.factories">
<factory
productGroup="org.eclipse.net4j.serverProtocols"
type="cdo"
class="org.eclipse.emf.cdo.internal.server.protocol.CDOPluginProtocolFactory"/>
</extension>
+
<extension
point="org.eclipse.emf.cdo.server.repositoryFactories">
<repositoryFactory
@@ -34,4 +36,13 @@
</repositoryFactory>
</extension>
+ <extension
+ point="org.eclipse.core.runtime.applications"
+ id="app"
+ name="CDO Server">
+ <application cardinality="1" thread="any">
+ <run class="org.eclipse.emf.cdo.internal.server.bundle.CDOServerApplication"/>
+ </application>
+ </extension>
+
</plugin>
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java
new file mode 100644
index 0000000..e801cdb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.server.bundle;
+
+import org.eclipse.net4j.internal.util.om.OSGiBundle;
+
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
+
+import org.osgi.framework.BundleException;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOServerApplication implements IApplication
+{
+ public CDOServerApplication()
+ {
+ }
+
+ public Object start(IApplicationContext context) throws Exception
+ {
+ return EXIT_OK;
+ }
+
+ public void stop()
+ {
+ try
+ {
+ ((OSGiBundle)OM.BUNDLE).getBundleContext().getBundle().stop();
+ }
+ catch (BundleException ex)
+ {
+ OM.LOG.error(ex);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
index 6b2cf29..235673f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/.settings/org.eclipse.jdt.core.prefs
@@ -1,57 +1,8 @@
-#Wed Jan 10 09:42:22 CET 2007
+#Fri Aug 31 19:39:44 CEST 2007
eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index 144cfe8..c2be9c5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -79,25 +79,25 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
switch (eClass.getClassifierID())
{
case Model1Package.ADDRESS:
- return (EObject)createAddress();
+ return createAddress();
case Model1Package.COMPANY:
- return (EObject)createCompany();
+ return createCompany();
case Model1Package.SUPPLIER:
- return (EObject)createSupplier();
+ return createSupplier();
case Model1Package.CUSTOMER:
- return (EObject)createCustomer();
+ return createCustomer();
case Model1Package.ORDER:
- return (EObject)createOrder();
+ return createOrder();
case Model1Package.ORDER_DETAIL:
- return (EObject)createOrderDetail();
+ return createOrderDetail();
case Model1Package.PURCHASE_ORDER:
- return (EObject)createPurchaseOrder();
+ return createPurchaseOrder();
case Model1Package.SALES_ORDER:
- return (EObject)createSalesOrder();
+ return createSalesOrder();
case Model1Package.CATEGORY:
- return (EObject)createCategory();
+ return createCategory();
case Model1Package.PRODUCT:
- return (EObject)createProduct();
+ return createProduct();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}