You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/01/15 17:36:01 UTC
[1/2] git commit: Some minor changes to keep m2e happy after syncing
the settings
Some minor changes to keep m2e happy after syncing the settings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7ebc98f7
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7ebc98f7
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7ebc98f7
Branch: refs/heads/master
Commit: 7ebc98f752f0a24ad55eff9a0b4b3a8a1db8f27c
Parents: 0b8a7ad
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Tue Jan 15 17:33:47 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Tue Jan 15 17:33:47 2013 +0100
----------------------------------------------------------------------
.../.settings/org.eclipse.wst.common.component | 51 ++++++++++++++-
.../org.eclipse.wst.common.project.facet.core.xml | 4 +-
.../.settings/org.eclipse.wst.common.component | 39 +++++++++++-
.../org.eclipse.wst.common.project.facet.core.xml | 4 +-
4 files changed, 92 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ebc98f7/wicket-examples/.settings/org.eclipse.wst.common.component
----------------------------------------------------------------------
diff --git a/wicket-examples/.settings/org.eclipse.wst.common.component b/wicket-examples/.settings/org.eclipse.wst.common.component
index a299cd5..95f3dac 100644
--- a/wicket-examples/.settings/org.eclipse.wst.common.component
+++ b/wicket-examples/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="wicket-core">
- <wb-resource deploy-path="/" source-path="/src/main/java"/>
- <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+ <dependent-module archiveName="wicket-core-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-core/wicket-core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-util-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-util/wicket-util">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-request-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-request/wicket-request">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-extensions-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-extensions/wicket-extensions">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-atmosphere-0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-atmosphere/wicket-atmosphere">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-guice-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-guice/wicket-guice">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-ioc-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-ioc/wicket-ioc">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-bean-validation-0.6-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-bean-validation/wicket-bean-validation">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-jmx-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-jmx/wicket-jmx">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-auth-roles-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-auth-roles/wicket-auth-roles">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-datetime-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-datetime/wicket-datetime">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-velocity-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-velocity/wicket-velocity">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-spring-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-spring/wicket-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-devutils-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-devutils/wicket-devutils">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-cdi-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-cdi/wicket-cdi">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <property name="context-root" value="wicket-examples"/>
+ <property name="java-output-path" value="/wicket-examples/target/classes"/>
</wb-module>
</project-modules>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ebc98f7/wicket-examples/.settings/org.eclipse.wst.common.project.facet.core.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/.settings/org.eclipse.wst.common.project.facet.core.xml b/wicket-examples/.settings/org.eclipse.wst.common.project.facet.core.xml
index c78d932..9f1491f 100644
--- a/wicket-examples/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/wicket-examples/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
- <installed facet="jst.utility" version="1.0"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ebc98f7/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.component
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.component b/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.component
index a299cd5..4ce6f96 100644
--- a/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.component
+++ b/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="wicket-core">
- <wb-resource deploy-path="/" source-path="/src/main/java"/>
- <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+ <dependent-module archiveName="wicket-examples-jar-0.6-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-examples-jar/wicket-examples-jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-atmosphere-0.7-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-atmosphere/wicket-atmosphere">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-auth-roles-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-auth-roles/wicket-auth-roles">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-bootstrap-0.6-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-bootstrap/wicket-bootstrap">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-core-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-core/wicket-core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-util-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-util/wicket-util">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-request-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-request/wicket-request">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-extensions-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-extensions/wicket-extensions">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-guice-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-guice/wicket-guice">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-ioc-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-ioc/wicket-ioc">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="wicket-spring-6.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-spring/wicket-spring">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <property name="context-root" value="wicket-examples-war"/>
+ <property name="java-output-path" value="/wicket-examples-war/target/classes"/>
</wb-module>
</project-modules>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7ebc98f7/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.project.facet.core.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.project.facet.core.xml b/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.project.facet.core.xml
index c78d932..9f1491f 100644
--- a/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/wicket-experimental/wicket-examples-parent/wicket-examples-war/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+ <fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
- <installed facet="jst.utility" version="1.0"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>