Author: gvanmatre
Date: Mon Jul 23 15:43:07 2007
New Revision: 558888
URL: http://svn.apache.org/viewvc?view=rev&rev=558888
Log:
The pde-maven-plugin's author, Dan Tran, was able to advice me on what was
missing from the pom config. The shale clay plugin for eclipse now has a maven
build. The only dependency is having eclipse 3.2 installed with the PDE
tools and configuring the eclipseInstall property for the pde-maven-plugin
(SHALE-444).
Removed:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/README.txt
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/commons-beanutils-1.7.0.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/commons-collections-3.1.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/commons-digester-1.8.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/commons-logging-1.1.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/servlet-api-2.4.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/shale-clay-1.1.0-SNAPSHOT.jar
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/lib/shale-core-1.1.0-SNAPSHOT.jar
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/.classpath
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/META-INF/MANIFEST.MF
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/build.properties
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/pom.xml
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/ClayMultipageEditor.java
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/VisualEditorEditorPart.java
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/faces/FacesConfigModel.java
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/.classpath
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/.classpath?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/.classpath
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/.classpath
Mon Jul 23 15:43:07 2007
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry including="**.svn" kind="src" path="src/main/java"/>
+ <classpathentry exported="true" kind="lib"
path="lib/commons-beanutils-1.7.0.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/commons-collections-3.1.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/commons-digester-1.8.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/commons-logging-1.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="lib" path="lib/servlet-api-2.4.jar"/>
+ <classpathentry kind="lib" path="lib/shale-clay-1.1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/shale-core-1.1.0-SNAPSHOT.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/META-INF/MANIFEST.MF?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/META-INF/MANIFEST.MF
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/META-INF/MANIFEST.MF
Mon Jul 23 15:43:07 2007
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Shale Clay Plugin for Eclipse
-Bundle-SymbolicName: org.apache.shale.shale_clay_plugin;singleton:=true
+Bundle-SymbolicName: shale_clay_plugin;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: clay_plugin.Activator
Bundle-Localization: plugin
@@ -48,66 +48,3 @@
lib/shale-clay-1.1.0-SNAPSHOT.jar,
lib/shale-core-1.1.0-SNAPSHOT.jar,
lib/servlet-api-2.4.jar
-Export-Package: META-INF,
- META-INF.maven.org.apache.shale.shale-clay,
- META-INF.maven.org.apache.shale.shale-core,
- clay_plugin,
- clay_plugin.attributes,
- clay_plugin.cassist,
- clay_plugin.dnd,
- clay_plugin.editor,
- clay_plugin.ext,
- clay_plugin.faces,
- clay_plugin.general,
- clay_plugin.jobs,
- clay_plugin.labels,
- clay_plugin.metapane,
- clay_plugin.model,
- clay_plugin.symbols,
- clay_plugin.util,
- clay_plugin.wizard,
- javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.apache.commons.beanutils,
- org.apache.commons.beanutils.converters,
- org.apache.commons.beanutils.locale,
- org.apache.commons.beanutils.locale.converters,
- org.apache.commons.collections,
- org.apache.commons.collections.bag,
- org.apache.commons.collections.bidimap,
- org.apache.commons.collections.buffer,
- org.apache.commons.collections.collection,
- org.apache.commons.collections.comparators,
- org.apache.commons.collections.functors,
- org.apache.commons.collections.iterators,
- org.apache.commons.collections.keyvalue,
- org.apache.commons.collections.list,
- org.apache.commons.collections.map,
- org.apache.commons.collections.set,
- org.apache.commons.digester,
- org.apache.commons.digester.parser,
- org.apache.commons.digester.plugins,
- org.apache.commons.digester.plugins.strategies,
- org.apache.commons.digester.substitution,
- org.apache.commons.digester.xmlrules,
- org.apache.commons.logging,
- org.apache.commons.logging.impl,
- org.apache.shale.clay,
- org.apache.shale.clay.component,
- org.apache.shale.clay.component.chain,
- org.apache.shale.clay.config,
- org.apache.shale.clay.config.beans,
- org.apache.shale.clay.convert,
- org.apache.shale.clay.faces,
- org.apache.shale.clay.parser,
- org.apache.shale.clay.parser.builder,
- org.apache.shale.clay.parser.builder.chain,
- org.apache.shale.clay.taglib,
- org.apache.shale.clay.utils,
- org.apache.shale.component,
- org.apache.shale.faces,
- org.apache.shale.renderer,
- org.apache.shale.resources,
- org.apache.shale.taglib,
- org.apache.shale.util
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/build.properties
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/build.properties?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/build.properties
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/build.properties
Mon Jul 23 15:43:07 2007
@@ -9,11 +9,4 @@
lib/commons-logging-1.1.jar,\
lib/shale-clay-1.1.0-SNAPSHOT.jar,\
lib/shale-core-1.1.0-SNAPSHOT.jar,\
- lib/servlet-api-2.4.jar
-jars.extra.classpath = lib/commons-beanutils-1.7.0.jar,\
- lib/commons-collections-3.1.jar,\
- lib/commons-digester-1.8.jar,\
- lib/commons-logging-1.1.jar,\
- lib/servlet-api-2.4.jar,\
- lib/shale-clay-1.1.0-SNAPSHOT.jar,\
- lib/shale-core-1.1.0-SNAPSHOT.jar
+ lib/servlet-api-2.4.jar
\ No newline at end of file
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/pom.xml?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/pom.xml
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/pom.xml
Mon Jul 23 15:43:07 2007
@@ -1,133 +1,130 @@
<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version
2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <!--
- <parent>
- <groupId>org.apache.shale</groupId>
- <artifactId>sandbox-parent</artifactId>
- <version>1-SNAPSHOT</version>
- </parent>
-
- -->
-
- <groupId>org.apache.shale</groupId>
- <artifactId>shale_clay_plugin</artifactId>
- <version>1-SNAPSHOT</version>
- <packaging>zip</packaging>
- <name>Shale Clay Plugin for Eclipse</name>
- <description></description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>pde-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <eclipseInstall>C:/IBM/eclipse-3-2</eclipseInstall>
- <antDebug>true</antDebug>
- <antVerbose>true</antVerbose>
- </configuration>
- </plugin>
-
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>dependent-libs</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
-
-
- <!--
- <copy todir="${basedir}/target/lib">
- <fileset refid="${project.compileArtifacts}"
/>
- <mapper type="flatten" />
- </copy>
- -->
-
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-clay</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <!--
+ <parent>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>sandbox-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ -->
+
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale_clay_plugin</artifactId>
+ <version>1-SNAPSHOT</version>
+ <packaging>zip</packaging>
+ <name>Shale Clay Plugin for Eclipse</name>
+ <description />
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>pde-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+
<eclipseInstall>C:/IBM/eclipse</eclipseInstall>
+ <antDebug>true</antDebug>
+ <antVerbose>true</antVerbose>
+ </configuration>
+ </plugin>
+
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+
<goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>
+ ${basedir}/lib
+ </outputDirectory>
+
<overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>
+ false
+ </overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-clay</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/ClayMultipageEditor.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/ClayMultipageEditor.java?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/ClayMultipageEditor.java
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/ClayMultipageEditor.java
Mon Jul 23 15:43:07 2007
@@ -36,7 +36,6 @@
private TextEditor xmlEditor;
- @Override
protected void createPages() {
createVisualPage();
@@ -71,7 +70,6 @@
}
- @Override
public void doSave(IProgressMonitor arg0) {
getActiveEditor().doSave(arg0);
@@ -79,7 +77,6 @@
firePropertyChange(PROP_DIRTY);
}
- @Override
public void doSaveAs() {
getActiveEditor().doSaveAs();
@@ -88,12 +85,10 @@
}
- @Override
public boolean isSaveAsAllowed() {
return true;
}
- @Override
protected void pageChange(int index) {
int lastActive = getActivePage();
@@ -116,7 +111,6 @@
}
- @Override
public boolean isDirty() {
return getActiveEditor().isDirty();
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/VisualEditorEditorPart.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/VisualEditorEditorPart.java?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/VisualEditorEditorPart.java
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/editor/VisualEditorEditorPart.java
Mon Jul 23 15:43:07 2007
@@ -17,7 +17,6 @@
package clay_plugin.editor;
-import java.io.IOException;
import java.net.URL;
import org.apache.shale.clay.config.ClayConfigParser;
@@ -54,7 +53,6 @@
import org.eclipse.ui.dialogs.SaveAsDialog;
import org.eclipse.ui.part.EditorPart;
import org.eclipse.ui.part.FileEditorInput;
-import org.xml.sax.SAXException;
import clay_plugin.attributes.AttributesMetadataComponent;
import clay_plugin.dnd.ClayComponentDragSourceListener2;
Modified:
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/faces/FacesConfigModel.java
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/faces/FacesConfigModel.java?view=diff&rev=558888&r1=558887&r2=558888
==============================================================================
---
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/faces/FacesConfigModel.java
(original)
+++
shale/sandbox/shale-eclipse-plugins/plugins/shale_clay_plugin_for_eclipse/src/main/java/clay_plugin/faces/FacesConfigModel.java
Mon Jul 23 15:43:07 2007
@@ -25,7 +25,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IPackageDeclaration;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
