summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-03-02 16:17:14 (EST)
committer pelder2006-03-02 16:17:14 (EST)
commit25c4f97feaf2a2d4951cd680c81b8586c53bab7e (patch)
treef83b94948a18cfa47283313478c074cda51b65ad
parentd6b8296475cb33863ec93c5fbc7ebf7c72691f14 (diff)
downloadorg.eclipse.jet-25c4f97feaf2a2d4951cd680c81b8586c53bab7e.zip
org.eclipse.jet-25c4f97feaf2a2d4951cd680c81b8586c53bab7e.tar.gz
org.eclipse.jet-25c4f97feaf2a2d4951cd680c81b8586c53bab7e.tar.bz2
[130184] Fixes for build: export all packages, get the package names right, include .options in build.properties.
-rw-r--r--plugins/org.eclipse.jet/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.jet/build.properties3
-rw-r--r--plugins/org.eclipse.jet/schema/tagLibraries.exsd12
-rw-r--r--plugins/org.eclipse.jet/schema/transform.exsd2
-rw-r--r--plugins/org.eclipse.jet/schema/xpathFunctions.exsd2
5 files changed, 17 insertions, 15 deletions
diff --git a/plugins/org.eclipse.jet/META-INF/MANIFEST.MF b/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
index 83e7dec..5f74862 100644
--- a/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
@@ -18,11 +18,6 @@ Require-Bundle: org.eclipse.ant.core,
Eclipse-AutoStart: true
Export-Package: org.eclipse.jet,
org.eclipse.jet.compiler,
- org.eclipse.jet.runtime.model,
- org.eclipse.jet.taglib,
- org.eclipse.jet.transform,
- org.eclipse.jet.xpath,
- org.eclipse.jet.xpath.inspector,
org.eclipse.jet.internal;x-friends:="org.eclipse.jet.tests,org.eclipse.jet.ui",
org.eclipse.jet.internal.builder;x-friends:="org.eclipse.jet.tests",
org.eclipse.jet.internal.compiler;x-friends:="org.eclipse.jet.tests",
@@ -40,5 +35,11 @@ Export-Package: org.eclipse.jet,
org.eclipse.jet.internal.xpath.ast;x-friends:="org.eclipse.jet.tests",
org.eclipse.jet.internal.xpath.functions;x-friends:="org.eclipse.jet.tests",
org.eclipse.jet.internal.xpath.inspectors;x-friends:="org.eclipse.jet.tests",
- org.eclipse.jet.internal.xpath.parser;x-friends:="org.eclipse.jet.tests"
+ org.eclipse.jet.internal.xpath.parser;x-friends:="org.eclipse.jet.tests",
+ org.eclipse.jet.runtime.model,
+ org.eclipse.jet.taglib,
+ org.eclipse.jet.taglib.workspace,
+ org.eclipse.jet.transform,
+ org.eclipse.jet.xpath,
+ org.eclipse.jet.xpath.inspector
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.jet/build.properties b/plugins/org.eclipse.jet/build.properties
index ca7e81c..25ca13e 100644
--- a/plugins/org.eclipse.jet/build.properties
+++ b/plugins/org.eclipse.jet/build.properties
@@ -16,7 +16,8 @@ bin.includes = META-INF/,\
tocExtensionPointiReference.xml,\
tocApiReference.xml,\
tocWhatsNew.xml,\
- about.html
+ about.html,\
+ .options
src.includes = templates/,\
src/,\
about.html
diff --git a/plugins/org.eclipse.jet/schema/tagLibraries.exsd b/plugins/org.eclipse.jet/schema/tagLibraries.exsd
index 9b6e172..a6b699d 100644
--- a/plugins/org.eclipse.jet/schema/tagLibraries.exsd
+++ b/plugins/org.eclipse.jet/schema/tagLibraries.exsd
@@ -118,7 +118,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractOtherTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractOtherTag"/>
</appInfo>
</annotation>
</attribute>
@@ -156,7 +156,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractFunctionTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractFunctionTag"/>
</appInfo>
</annotation>
</attribute>
@@ -194,7 +194,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractIteratingTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractIteratingTag"/>
</appInfo>
</annotation>
</attribute>
@@ -247,7 +247,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractConditionalTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractConditionalTag"/>
</appInfo>
</annotation>
</attribute>
@@ -300,7 +300,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractEmptyTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractEmptyTag"/>
</appInfo>
</annotation>
</attribute>
@@ -387,7 +387,7 @@
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.taglib.AbstractContainerTag"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.taglib.AbstractContainerTag"/>
</appInfo>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.jet/schema/transform.exsd b/plugins/org.eclipse.jet/schema/transform.exsd
index 4bdf32d..5d8053e 100644
--- a/plugins/org.eclipse.jet/schema/transform.exsd
+++ b/plugins/org.eclipse.jet/schema/transform.exsd
@@ -118,7 +118,7 @@
<attribute name="id" type="string" use="required">
<annotation>
<documentation>
- The tag library id. Example: org.eclipse.emf.jet2.controlTags
+ The tag library id. Example: org.eclipse.jet.controlTags
</documentation>
</annotation>
</attribute>
diff --git a/plugins/org.eclipse.jet/schema/xpathFunctions.exsd b/plugins/org.eclipse.jet/schema/xpathFunctions.exsd
index 04a9c25..8a725b9 100644
--- a/plugins/org.eclipse.jet/schema/xpathFunctions.exsd
+++ b/plugins/org.eclipse.jet/schema/xpathFunctions.exsd
@@ -57,7 +57,7 @@
The Java class that implements the function.
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.emf.jet2.xpath.XPathFunction"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.jet.xpath.XPathFunction"/>
</appInfo>
</annotation>
</attribute>