Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/build.xml10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/toc.xml17
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/buildSchema.ant19
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java27
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java3
-rw-r--r--plugins/org.eclipse.net4j.db.doc/build.xml4
-rw-r--r--plugins/org.eclipse.net4j.doc/build.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/build.xml4
11 files changed, 59 insertions, 44 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml
index 3c847a7df1..cd09e3af7b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/build.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/build.xml
@@ -280,10 +280,12 @@
<target name="build.schema" unless="schema.skip">
<mkdir dir="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo/plugin.xml" destination="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server/plugin.xml" destination="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server.db/plugin.xml" destination="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml" destination="${schemadoc.destdir}" />
+ <copyfile dest="${schemadoc.destdir}" src="plugins/org.eclipse.emf.cdo.releng.doc/schema.css" />
+
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.emf.cdo/plugin.xml" />
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.emf.cdo.server/plugin.xml" />
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.emf.cdo.server.db/plugin.xml" />
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.emf.cdo.server.hibernate/plugin.xml" />
<replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
<fileset dir="${schemadoc.destdir}">
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html
deleted file mode 100644
index 8aafc049b7..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/Schemadoc.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Schemadoc</h1>
-<a name="Schemadoc.html"/>
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
index 4acb5e4e77..36ea7310bd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xml
@@ -98,9 +98,20 @@
</topic>
</topic>
<topic label="Extension Point Reference" href="schemadoc/overview-summary.html">
- <topic label="org.eclipse.emf.cdo.server.appExtensions" href="schemadoc/org.eclipse.emf.cdo.server.appExtensions.html" />
- <topic label="org.eclipse.emf.cdo.server.repositoryFactories" href="schemadoc/org.eclipse.emf.cdo.server.repositoryFactories.html" />
- <topic label="org.eclipse.emf.cdo.server.storeFactories" href="schemadoc/org.eclipse.emf.cdo.server.storeFactories.html" />
+ <topic label="CDO Model Repository Client" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html">
+ <topic label="viewProviders" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html" />
+ </topic>
+ <topic label="CDO Model Repository Server" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html">
+ <topic label="appExtensions" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" />
+ <topic label="repositoryFactories" href="schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" />
+ <topic label="storeFactories" href="schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" />
+ </topic>
+ <topic label="CDO Model Repository Server DB" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html">
+ <topic label="mappingStrategies" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" />
+ </topic>
+ <topic label="CDO Model Repository Server Hibernate" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html">
+ <topic label="mappingProviderFactories" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" />
+ </topic>
</topic>
</topic>
<topic label="Online Information" href="html/online">
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/buildSchema.ant b/plugins/org.eclipse.emf.cdo.releng.doc/buildSchema.ant
deleted file mode 100644
index a737457364..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.doc/buildSchema.ant
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project name="Schema" default="build" basedir="../..">
-
- <property name="releng.project" value="plugins/org.eclipse.emf.cdo.releng.doc" />
- <property name="doc.project" value="plugins/org.eclipse.emf.cdo.doc" />
- <property name="schemadoc" value="${doc.project}/schemadoc" />
-
- <target name="build">
- <mkdir dir="${schemadoc}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.emf.cdo.server/plugin.xml" destination="${schemadoc}" />
-
- <replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
- <fileset dir="${schemadoc}">
- <include name="*.html" />
- </fileset>
- </replaceregexp>
- </target>
-
-</project>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
index 33d3e1465b..9e1f61e55b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/buildTemplate.ant
@@ -145,6 +145,8 @@
<target name="build.schema" unless="schema.skip">
<mkdir dir="${schemadoc.destdir}" />
+ <copyfile dest="${schemadoc.destdir}" src="plugins/org.eclipse.emf.cdo.releng.doc/schema.css" />
+
<!-- SCHEMA CONVERSIONS -->
<replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
index 9b0ded9116..d9e28312a9 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
@@ -99,7 +99,7 @@ public class AssembleScripts
assembleArticleOptions(javaDoc);
javaDoc.generateAnt();
- javaDoc.generateToc();
+ javaDoc.generateTocXmi();
}
ANTLIB.generate();
@@ -857,8 +857,8 @@ public class AssembleScripts
{
for (String schemaPlugin : sort(schemaPlugins))
{
- writer.write("\t\t<pde.convertSchemaToHTML manifest=\"plugins/" + schemaPlugin
- + "/plugin.xml\" destination=\"${schemadoc.destdir}\" />\n");
+ writer.write("\t\t<pde.convertSchemaToHTML destination=\"${schemadoc.destdir}\" manifest=\"plugins/"
+ + schemaPlugin + "/plugin.xml\" />\n");
}
}
else if ("<!-- JAVADOC DEPENDENCIES -->".equals(id))
@@ -916,9 +916,9 @@ public class AssembleScripts
}
}
- public void generateToc() throws IOException
+ public void generateTocXmi() throws IOException
{
- Resource resource = getTocResource(getProject(), true);
+ Resource resource = getTocXmiResource(getProject(), true);
System.out.println("Generating " + resource.getURI().path());
for (SourcePlugin sourcePlugin : getSortedSourcePlugins())
@@ -946,7 +946,7 @@ public class AssembleScripts
resource.save(null);
}
- public static Resource getTocResource(File project, boolean create) throws IOException
+ public static Resource getTocXmiResource(File project, boolean create) throws IOException
{
ArticlePackage.eINSTANCE.eClass();
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index 8241e1db7b..737dea3186 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
@@ -23,7 +23,6 @@ import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.resource.Resource;
@@ -306,11 +305,11 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
{
try
{
- Resource resource = AssembleScripts.JavaDoc.getTocResource(projectFolder, false);
+ Resource resource = AssembleScripts.JavaDoc.getTocXmiResource(projectFolder, false);
- for (EObject eObject : resource.getContents())
+ for (Object content : resource.getContents().toArray())
{
- getPlugins().add((Plugin)eObject);
+ getPlugins().add((Plugin)content);
}
}
catch (IOException ex)
@@ -338,7 +337,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
public Context getContext()
{
if (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT)
+ {
return null;
+ }
return (Context)eContainer();
}
@@ -360,24 +361,34 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
*/
public void setContext(Context newContext)
{
- if (newContext != eInternalContainer()
- || (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT && newContext != null))
+ if (newContext != eInternalContainer() || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT
+ && newContext != null)
{
if (EcoreUtil.isAncestor(this, newContext))
+ {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ }
NotificationChain msgs = null;
if (eInternalContainer() != null)
+ {
msgs = eBasicRemoveFromContainer(msgs);
+ }
if (newContext != null)
+ {
msgs = ((InternalEObject)newContext).eInverseAdd(this, ArticlePackage.CONTEXT__DOCUMENTATIONS, Context.class,
msgs);
+ }
msgs = basicSetContext(newContext, msgs);
if (msgs != null)
+ {
msgs.dispatch();
+ }
}
else if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext,
newContext));
+ }
}
/**
@@ -447,7 +458,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
{
case ArticlePackage.DOCUMENTATION__CONTEXT:
if (eInternalContainer() != null)
+ {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetContext((Context)otherEnd, msgs);
case ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getEmbeddableElements()).basicAdd(otherEnd, msgs);
@@ -597,7 +610,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (project: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
index ecd0637462..f561b01e84 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
@@ -92,6 +92,7 @@ public class SchemadocImpl extends CategoryImpl implements Schemadoc
private String getHref(ExtensionPoint extensionPoint)
{
- return "schemadoc/" + extensionPoint.getName() + ".html";
+ String plugin = extensionPoint.getPlugin().getName().replace('.', '_');
+ return "schemadoc/" + plugin + "_" + extensionPoint.getName() + ".html";
}
} // SchemadocImpl
diff --git a/plugins/org.eclipse.net4j.db.doc/build.xml b/plugins/org.eclipse.net4j.db.doc/build.xml
index bdaf7fc067..eb3285e5e4 100644
--- a/plugins/org.eclipse.net4j.db.doc/build.xml
+++ b/plugins/org.eclipse.net4j.db.doc/build.xml
@@ -173,7 +173,9 @@
<target name="build.schema" unless="schema.skip">
<mkdir dir="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.net4j.db/plugin.xml" destination="${schemadoc.destdir}" />
+ <copyfile dest="${schemadoc.destdir}" src="plugins/org.eclipse.emf.cdo.releng.doc/schema.css" />
+
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.net4j.db/plugin.xml" />
<replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
<fileset dir="${schemadoc.destdir}">
diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml
index 19234d6fc3..884ae70170 100644
--- a/plugins/org.eclipse.net4j.doc/build.xml
+++ b/plugins/org.eclipse.net4j.doc/build.xml
@@ -202,6 +202,8 @@
<target name="build.schema" unless="schema.skip">
<mkdir dir="${schemadoc.destdir}" />
+ <copyfile dest="${schemadoc.destdir}" src="plugins/org.eclipse.emf.cdo.releng.doc/schema.css" />
+
<replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
<fileset dir="${schemadoc.destdir}">
diff --git a/plugins/org.eclipse.net4j.util.doc/build.xml b/plugins/org.eclipse.net4j.util.doc/build.xml
index ab8a789a74..7573cd76c3 100644
--- a/plugins/org.eclipse.net4j.util.doc/build.xml
+++ b/plugins/org.eclipse.net4j.util.doc/build.xml
@@ -207,7 +207,9 @@
<target name="build.schema" unless="schema.skip">
<mkdir dir="${schemadoc.destdir}" />
- <pde.convertSchemaToHTML manifest="plugins/org.eclipse.net4j.util/plugin.xml" destination="${schemadoc.destdir}" />
+ <copyfile dest="${schemadoc.destdir}" src="plugins/org.eclipse.emf.cdo.releng.doc/schema.css" />
+
+ <pde.convertSchemaToHTML destination="${schemadoc.destdir}" manifest="plugins/org.eclipse.net4j.util/plugin.xml" />
<replaceregexp match="\.\./\.\./(.*?)\.css" replace="\1.css" byline="true">
<fileset dir="${schemadoc.destdir}">

Back to the top