You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/08/27 20:32:39 UTC
svn commit: r1162413 - in
/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui:
META-INF/ META-INF/MANIFEST.MF build.properties icons/ plugin.xml pom.xml
src/main/resources/icons/
Author: bimargulies
Date: Sat Aug 27 18:32:39 2011
New Revision: 1162413
URL: http://svn.apache.org/viewvc?rev=1162413&view=rev
Log:
One plugin down, N to go. This one now builds. Hard to tell if it works until the others are done.
Added:
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/src/main/resources/icons/
- copied from r1162393, maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/icons/
Modified:
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/icons/
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/plugin.xml
maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
Added: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF?rev=1162413&view=auto
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF (added)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/META-INF/MANIFEST.MF Sat Aug 27 18:32:39 2011
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Doxia Eclipse IDE plugins common resources
+Bundle-SymbolicName: org.apache.maven.doxia.ide.eclipse.common.ui
+ ;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.apache.maven.doxia.ide.dependencies,
+ org.eclipse.equinox.common;bundle-version="3.6.0",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.ui.ide,
+ org.eclipse.ui.console,
+ org.eclipse.swt,
+ org.eclipse.jface,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench,
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.wst.sse.core,
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.core,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.wst.common.ui
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
+Bundle-Vendor: Apache Software Foundation
+Bundle-Activator: org.apache.maven.doxia.ide.eclipse.common.ui.CommonPlugin
Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties?rev=1162413&r1=1162412&r2=1162413&view=diff
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties (original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/build.properties Sat Aug 27 18:32:39 2011
@@ -1,8 +1,7 @@
source.. = src/main/java/,\
src/main/resources
output.. = target/classes/
-bin.includes = .,\
+bin.includes = META-INF/,\
plugin.properties,\
plugin.xml,\
- lib/doxia-converter-1.2-jar-with-dependencies.jar,\
target/classes/
Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/plugin.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/plugin.xml?rev=1162413&r1=1162412&r2=1162413&view=diff
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/plugin.xml (original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/plugin.xml Sat Aug 27 18:32:39 2011
@@ -20,174 +20,7 @@ under the License.
-->
<?eclipse version="3.2"?>
-<plugin
- id="org.apache.maven.doxia.ide.eclipse.common.ui"
- name="%plugin.name"
- version="1.0"
- provider-name="%plugin.provider.name"
- class="org.apache.maven.doxia.ide.eclipse.common.ui.CommonPlugin">
-
- <runtime>
- <library name="lib/doxia-converter-1.2-jar-with-dependencies.jar">
- <export
- name="*">
- </export>
- </library>
- <library name=".">
- <export
- name="org.apache.maven.doxia.*">
- </export>
- <export
- name="org.apache.maven.doxia.cli.*">
- </export>
- <export
- name="org.apache.maven.doxia.document.*">
- </export>
- <export
- name="org.apache.maven.doxia.document.io.xpp3.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.actions.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.composites.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.contentassist.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.dialogs.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.editors.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.editors.text.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.editors.text.source.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.editors.xml.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.rules.*">
- </export>
- <export
- name="org.apache.maven.doxia.ide.eclipse.common.ui.wizards.*">
- </export>
- <export
- name="org.apache.maven.doxia.index.*">
- </export>
- <export
- name="org.apache.maven.doxia.logging.*">
- </export>
- <export
- name="org.apache.maven.doxia.macro.*">
- </export>
- <export
- name="org.apache.maven.doxia.macro.manager.*">
- </export>
- <export
- name="org.apache.maven.doxia.macro.snippet.*">
- </export>
- <export
- name="org.apache.maven.doxia.macro.toc.*">
- </export>
- <export
- name="org.apache.maven.doxia.markup.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.apt.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.confluence.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.confluence.parser.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.confluence.parser.list.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.confluence.parser.table.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.docbook.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.fml.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.fml.model.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.fo.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.itext.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.latex.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.rtf.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.site.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.site.manager.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.twiki.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.twiki.parser.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.xdoc.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.xhtml.*">
- </export>
- <export
- name="org.apache.maven.doxia.module.xhtml.decoration.render.*">
- </export>
- <export
- name="org.apache.maven.doxia.parser.*">
- </export>
- <export
- name="org.apache.maven.doxia.parser.manager.*">
- </export>
- <export
- name="org.apache.maven.doxia.sink.*">
- </export>
- <export
- name="org.apache.maven.doxia.util.*">
- </export>
- <export
- name="org.apache.maven.doxia.wrapper.*">
- </export>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.wst.common.ui"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- <import plugin="org.eclipse.wst.sse.ui"/>
- <import plugin="org.eclipse.wst.xml.core"/>
- <import plugin="org.eclipse.wst.xml.ui"/>
- </requires>
+<plugin>
<extension
id="doxiaide.product"
@@ -198,7 +31,7 @@ under the License.
name="Doxia Eclipse IDE">
<property
name="windowImages"
- value="icons/doxia.gif"/>
+ value="src/main/resources/icons/doxia.gif"/>
<property
name="appName"
value="DoxiaIDE"/>
Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml?rev=1162413&r1=1162412&r2=1162413&view=diff
==============================================================================
--- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml (original)
+++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/eclipse-plugins/plugins/org.apache.maven.doxia.ide.eclipse.common.ui/pom.xml Sat Aug 27 18:32:39 2011
@@ -26,187 +26,22 @@ under the License.
<groupId>org.apache.maven.doxia.ide</groupId>
<artifactId>plugins</artifactId>
<version>1.0-tycho-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.doxia.ide.plugins</groupId>
<artifactId>common-ui</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
<name>Doxia Tools :: Eclipse IDE - Common UI Plugin</name>
<description>Eclipse IDE - Common UI Plugin</description>
- <dependencies>
- <!-- Eclipse dependencies as defined in plugin.xml -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jface</groupId>
- <artifactId>text</artifactId>
- </dependency>
+ <dependencies>
<dependency>
- <groupId>org.eclipse.wst.sse</groupId>
- <artifactId>core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.sse</groupId>
- <artifactId>ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.xml</groupId>
- <artifactId>core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.xml</groupId>
- <artifactId>ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.wst.common</groupId>
- <artifactId>ui</artifactId>
+ <groupId>org.apache.maven.doxia.ide</groupId>
+ <artifactId>dependencies</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+</project>
- <build>
- <finalName>org.apache.maven.doxia.ide.eclipse.common.ui_${project.version}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-compile</id>
- <phase>compile</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-converter</artifactId>
- <version>${doxiaConverterVersion}</version>
- <classifier>jar-with-dependencies</classifier>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${libdir}</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <!-- Eclipse dependencies OS specific -->
- <profiles>
- <profile>
- <id>linux-x86</id>
- <activation>
- <os>
- <arch>i386</arch>
- <family>unix</family>
- <name>linux</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>linux-x86_64</id>
- <activation>
- <os>
- <arch>amd64</arch>
- <family>unix</family>
- <name>linux</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.gtk.linux</groupId>
- <artifactId>x86_64</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>solaris-sparc</id>
- <activation>
- <os>
- <arch>sparc</arch>
- <family>unix</family>
- <name>SunOS</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.gtk.solaris</groupId>
- <artifactId>sparc</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>macosx</id>
- <activation>
- <os>
- <family>unix</family>
- <name>mac os x</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.carbon</groupId>
- <artifactId>macosx</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>win32</id>
- <activation>
- <os>
- <arch>x86</arch>
- <family>windows</family>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>win64</id>
- <activation>
- <os>
- <arch>amd64</arch>
- <family>windows</family>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86_64</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>