Seam SVN: r11142 - in branches/community/Seam_2_2: seam-gen/ivy and 1 other directory.
by seam-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2009-06-12 09:14:06 -0400 (Fri, 12 Jun 2009)
New Revision: 11142
Modified:
branches/community/Seam_2_2/build/root.pom.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
Log:
JBSEAM-4048 Updated RichFaces version to 3.3.1.GA
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2009-06-12 12:33:38 UTC (rev 11141)
+++ branches/community/Seam_2_2/build/root.pom.xml 2009-06-12 13:14:06 UTC (rev 11142)
@@ -38,7 +38,7 @@
<!-- Externalize some version numbers here -->
<properties>
- <version.richfaces>3.3.0.GA</version.richfaces>
+ <version.richfaces>3.3.1.GA</version.richfaces>
<version.wicket>1.3.5.jboss1</version.wicket>
<version.drools>5.0.1</version.drools>
</properties>
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 12:33:38 UTC (rev 11141)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 13:14:06 UTC (rev 11142)
@@ -11,7 +11,7 @@
<!-- centralize some key artifact versions -->
<property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
- <property name="richfaces.version" value="3.3.0.GA"/>
+ <property name="richfaces.version" value="3.3.1.GA"/>
<property name="jboss-embedded.version" value="beta3"/>
<target name="init-ivy">
15 years, 5 months
Seam SVN: r11141 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT.
by seam-commits@lists.jboss.org
Author: nico.ben
Date: 2009-06-12 08:33:38 -0400 (Fri, 12 Jun 2009)
New Revision: 11141
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Xml.po
Log:
Italian translation
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Xml.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Xml.po 2009-06-12 10:54:46 UTC (rev 11140)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Xml.po 2009-06-12 12:33:38 UTC (rev 11141)
@@ -477,7 +477,7 @@
#: Xml.xml:203
#, no-c-format
msgid "In the second option, the class name is implied by the file in which the component definition appears."
-msgstr "Nella seconda opzione, il nome della classe è implicato nel file in cui appare la definizione del componente."
+msgstr "Nella seconda opzione, il nome della classe è implicito nel file in cui appare la definizione del componente."
#. Tag: para
#: Xml.xml:208
15 years, 5 months
Seam SVN: r11140 - branches/community/Seam_2_2/build.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-06-12 06:54:46 -0400 (Fri, 12 Jun 2009)
New Revision: 11140
Modified:
branches/community/Seam_2_2/build/root.pom.xml
Log:
JBSEAM-4201
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2009-06-12 10:46:49 UTC (rev 11139)
+++ branches/community/Seam_2_2/build/root.pom.xml 2009-06-12 10:54:46 UTC (rev 11140)
@@ -376,6 +376,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
15 years, 5 months
Seam SVN: r11139 - branches/community/Seam_2_2/seam-gen/build-scripts.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-06-12 06:46:49 -0400 (Fri, 12 Jun 2009)
New Revision: 11139
Modified:
branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-ear.list
branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-war.list
Log:
JBSEAM-4049 - missing drools-decisiontables.jar in list of ear and war jars
Modified: branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-ear.list 2009-06-12 10:07:22 UTC (rev 11138)
+++ branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-ear.list 2009-06-12 10:46:49 UTC (rev 11139)
@@ -1,6 +1,7 @@
antlr-runtime.jar
commons-beanutils.jar
core.jar
+drools-decisiontables.jar
drools-compiler.jar
drools-api.jar
drools-core.jar
Modified: branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-war.list
===================================================================
--- branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-war.list 2009-06-12 10:07:22 UTC (rev 11138)
+++ branches/community/Seam_2_2/seam-gen/build-scripts/deployed-jars-war.list 2009-06-12 10:46:49 UTC (rev 11139)
@@ -2,6 +2,7 @@
commons-beanutils.jar
commons-digester.jar
core.jar
+drools-decisiontables.jar
drools-api.jar
drools-compiler.jar
drools-core.jar
15 years, 5 months
Seam SVN: r11138 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT.
by seam-commits@lists.jboss.org
Author: nico.ben
Date: 2009-06-12 06:07:22 -0400 (Fri, 12 Jun 2009)
New Revision: 11138
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Getting_Started_With_JBoss_Tools.po
branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Weblogic.po
Log:
Italian translation
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Getting_Started_With_JBoss_Tools.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Getting_Started_With_JBoss_Tools.po 2009-06-12 09:00:42 UTC (rev 11137)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Getting_Started_With_JBoss_Tools.po 2009-06-12 10:07:22 UTC (rev 11138)
@@ -6,7 +6,7 @@
"Project-Id-Version: seam 2_0\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-04-15 13:51+0000\n"
-"PO-Revision-Date: 2009-04-15 16:01+0100\n"
+"PO-Revision-Date: 2009-06-12 12:05+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -342,7 +342,7 @@
#: Getting_Started_With_JBoss_Tools.xml:581
#, no-c-format
msgid "Seam and incremental hot deployment with JBoss Tools"
-msgstr "Seam ed l'hot deploy incrementale con JBoss Tools"
+msgstr "Seam e hot deploy incrementale con JBoss Tools"
#. Tag: para
#: Getting_Started_With_JBoss_Tools.xml:583
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Weblogic.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Weblogic.po 2009-06-12 09:00:42 UTC (rev 11137)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/it-IT/Weblogic.po 2009-06-12 10:07:22 UTC (rev 11138)
@@ -6,7 +6,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-06-11 07:43+0000\n"
-"PO-Revision-Date: 2009-06-11 09:51+0100\n"
+"PO-Revision-Date: 2009-06-12 11:41+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@
#: Weblogic.xml:67
#, no-c-format
msgid "Here are the quick steps to installing Weblogic 10.3. For more details or if you are having any issues please check with the BEA docs at the <ulink url=\"http://edocs.bea.com/wls/docs103/\"> Weblogic 10.3 Doc Center </ulink> . Here we install the RHEL 5 version using the graphical installer:"
-msgstr "Ecco velocemente i passi necessari ad installare Weblogic 10.3. Per maggiori dettagli e nel caso si presentino dei problemi,vi preghiamo di consultare i documenti BEA all'indirizzo <ulink url=\"http://edocs.bea.com/wls/docs103/\"> Weblogic 10.3 Doc Center </ulink> . Qui verrà installata la versione RHEL 5 usando l'installazione grafica:"
+msgstr "Ecco velocemente i passi necessari ad installare Weblogic 10.3. Per maggiori dettagli e nel caso si presentino dei problemi, consultare i documenti BEA all'indirizzo <ulink url=\"http://edocs.bea.com/wls/docs103/\"> Weblogic 10.3 Doc Center </ulink> . Qui verrà installata la versione RHEL 5 usando l'installazione grafica:"
#. Tag: para
#: Weblogic.xml:80
15 years, 5 months
Seam SVN: r11137 - in sandbox/trunk/modules: xwidgets and 10 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-06-12 05:00:42 -0400 (Fri, 12 Jun 2009)
New Revision: 11137
Added:
sandbox/trunk/modules/xwidgets/
sandbox/trunk/modules/xwidgets/examples/
sandbox/trunk/modules/xwidgets/examples/helloworld/
sandbox/trunk/modules/xwidgets/examples/helloworld/index.html
sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw
sandbox/trunk/modules/xwidgets/src/
sandbox/trunk/modules/xwidgets/src/main/
sandbox/trunk/modules/xwidgets/src/main/java/
sandbox/trunk/modules/xwidgets/src/main/java/org/
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/View.java
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Button.java
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Image.java
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/InputText.java
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Label.java
sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Panel.java
sandbox/trunk/modules/xwidgets/src/main/javascript/
sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js
sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
Log:
new sandbox project
Added: sandbox/trunk/modules/xwidgets/examples/helloworld/index.html
===================================================================
--- sandbox/trunk/modules/xwidgets/examples/helloworld/index.html (rev 0)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/index.html 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,15 @@
+<html>
+ <body>
+ <h1>Hello World Example</h1>
+
+ <div id="container"></div>
+
+ <script src="../../src/main/javascript/xw.js"></script>
+ <script src="../../src/main/javascript/xw.Panel.js"></script>
+ <script src="../../src/main/javascript/xw.Label.js"></script>
+
+ <script type="text/javascript">
+ xw.openView("test.xw", "container");
+ </script>
+ </body>
+</html>
Added: sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw
===================================================================
--- sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw (rev 0)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<view xmlns="http://jboss.com/products/xwidgets">
+ <panel>
+ <label value="Hello World!"/>
+
+
+ </panel>
+</view>
\ No newline at end of file
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/View.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/View.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/View.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,6 @@
+package org.jboss.xwidgets;
+
+public class View
+{
+
+}
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Button.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Button.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Button.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,6 @@
+package org.jboss.xwidgets.controls;
+
+public class Button
+{
+
+}
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Image.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Image.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Image.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,6 @@
+package org.jboss.xwidgets.controls;
+
+public class Image
+{
+
+}
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/InputText.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/InputText.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/InputText.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,6 @@
+package org.jboss.xwidgets.controls;
+
+public class InputText
+{
+
+}
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Label.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Label.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Label.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,20 @@
+package org.jboss.xwidgets.controls;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+public class Label
+{
+ private String value;
+
+ public String getValue()
+ {
+ return value;
+ }
+
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+}
Added: sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Panel.java
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Panel.java (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/java/org/jboss/xwidgets/controls/Panel.java 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,10 @@
+package org.jboss.xwidgets.controls;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+public class Panel
+{
+
+}
Added: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,23 @@
+Package("xw.controls");
+
+xw.controls.Label = function()
+{
+ this.value = "";
+ this.parent = null;
+ this.control = null;
+
+ xw.controls.Label.prototype.setParent = function(parent)
+ {
+ this.parent = parent;
+ }
+
+ xw.controls.Label.prototype.paint = function()
+ {
+ if (this.control == null)
+ {
+ this.control = document.createTextNode(this.value);
+ this.control.widget = this;
+ this.parent.control.appendChild(this.control);
+ }
+ }
+}
Added: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,29 @@
+Package("xw.controls");
+
+xw.controls.Panel = function()
+{
+ this.width = 200;
+ this.height = 100;
+ this.parent = null;
+ this.control = null;
+
+ xw.controls.Panel.prototype.setParent = function(parent)
+ {
+ this.parent = parent;
+ }
+
+ xw.controls.Panel.prototype.paint = function()
+ {
+ if (this.control == null)
+ {
+ this.control = document.createElement("div");
+ this.control.widget = this;
+ this.parent.control.appendChild(this.control);
+
+ this.control.style.width = "100%";
+ this.control.style.height = "100%";
+
+ this.control.style.border = "1px solid black";
+ }
+ }
+}
Added: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
===================================================================
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js (rev 0)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js 2009-06-12 09:00:42 UTC (rev 11137)
@@ -0,0 +1,170 @@
+function Package(fullName)
+{
+ var pkg = window;
+ var parts = fullName.split(".");
+ for (var i = 0; i < parts.length; i++)
+ {
+ if (typeof pkg[parts[i]] == "undefined")
+ pkg[parts[i]] = {};
+ pkg = pkg[parts[i]];
+ }
+}
+
+Package("xw");
+
+/**
+ * System Utils
+ */
+xw.Sys = {};
+xw.Sys.getObject = function(id)
+{
+ if (document.getElementById && document.getElementById(id))
+ return document.getElementById(id);
+ else if (document.all && document.all(id))
+ return document.all(id);
+ else if (document.layers && document.layers[id])
+ return document.layers[id];
+ else
+ return false;
+}
+
+/**
+ * View Loader - loads view definitions from a URL
+ */
+xw.ViewLoader = {};
+xw.ViewLoader.load = function(viewName, callback)
+{
+ if (window.XMLHttpRequest)
+ {
+ asyncReq = new XMLHttpRequest();
+ if (asyncReq.overrideMimeType)
+ asyncReq.overrideMimeType("text/xml");
+ }
+ else
+ {
+ asyncReq = new ActiveXObject("Microsoft.XMLHTTP");
+ }
+
+ asyncReq.onreadystatechange = function() { callback(asyncReq) };
+ asyncReq.open("GET", viewName, true);
+ asyncReq.send(null);
+ return asyncReq;
+}
+
+/**
+ * View manager - responsible for caching views
+ */
+xw.ViewManager = {};
+xw.ViewManager.views = {};
+xw.ViewManager.loadViewCallback = function(req, container)
+{
+ if (req.readyState == 4)
+ {
+ if (req.status == 200 || req.status == 0)
+ {
+ xw.renderView(req.responseXML.documentElement, container);
+ }
+ else
+ {
+ alert("There was an error processing your request. Error code: " + req.status);
+ }
+ }
+}
+
+xw.ViewManager.openView = function(viewName, container)
+{
+ var callback = function(req) {
+ xw.ViewManager.loadViewCallback(req, container);
+ };
+ xw.ViewLoader.load(viewName, callback);
+}
+
+/**
+ * Base class for controls
+ */
+xw.Control = function()
+{
+ this.parent = null;
+ xw.Control.prototype.setParent = function(parent)
+ {
+ this.parent = parent;
+ }
+}
+
+/**
+ * A single instance of a view
+ */
+xw.View = function(viewRoot, container)
+{
+ this.viewRoot = viewRoot;
+ this.container = container;
+ this.control = xw.Sys.getObject(container);
+
+ xw.View.prototype.render = function()
+ {
+ this.element =
+ this.renderChildren(this.viewRoot.childNodes, this);
+ }
+
+ xw.View.prototype.renderChildren = function(children, parentControl)
+ {
+ for (var i = 0; i < children.length; i++)
+ {
+ if (children.item(i) instanceof Element)
+ {
+ this.renderControl(children.item(i), parentControl);
+ }
+ }
+ }
+
+ xw.View.prototype.renderControl = function(element, parent)
+ {
+ var tag = element.tagName;
+ var controlName = tag.substring(0,1).toUpperCase() +
+ tag.substring(1, tag.length);
+
+ var control = eval("new xw.controls." + controlName + "()");
+
+ control.setParent(parent);
+
+ if (element.hasAttributes())
+ {
+ // Set control properties
+ for (var i = 0; i < element.attributes.length; i++)
+ {
+ var name = element.attributes[i].name;
+ var value = element.getAttribute(name);
+ control[name] = value;
+ }
+ }
+
+ control.paint();
+
+ var children = element.childNodes;
+ if (children.length > 0)
+ {
+ this.renderChildren(children, control);
+ }
+ }
+}
+
+/**
+ * General methods
+ */
+xw.openView = function(viewName, container)
+{
+ xw.ViewManager.openView(viewName, container);
+}
+
+xw.renderView = function(viewRoot, container)
+{
+ if (viewRoot.tagName == "view")
+ {
+ var view = new xw.View(viewRoot, container);
+ view.render();
+ }
+ else
+ {
+ alert("Invalid view definition - document root is not 'view' element");
+ }
+}
\ No newline at end of file
15 years, 5 months
Seam SVN: r11136 - tags.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-06-12 04:49:04 -0400 (Fri, 12 Jun 2009)
New Revision: 11136
Added:
tags/JBPAPP_4_3_CP04_FP/
Removed:
tags/JBPAPP_4_3_CP04_FP_CR1/
Log:
Copied: tags/JBPAPP_4_3_CP04_FP (from rev 11135, tags/JBPAPP_4_3_CP04_FP_CR1)
15 years, 5 months
Seam SVN: r11135 - branches/community/Seam_2_2/seam-gen/ivy.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-06-12 04:33:15 -0400 (Fri, 12 Jun 2009)
New Revision: 11135
Modified:
branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
Log:
removed renaming mvel.jar to mvel14.jar
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 04:06:41 UTC (rev 11134)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 08:33:15 UTC (rev 11135)
@@ -35,7 +35,6 @@
<target name="inflate-core" depends="load-ivy">
<ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="default"/>
- <move file="${lib.dir}/mvel.jar" tofile="${lib.dir}/mvel14.jar" failonerror="false"/>
</target>
<target name="inflate-source" depends="load-ivy">
15 years, 5 months
Seam SVN: r11134 - branches/community/Seam_2_2/seam-gen/ivy.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-06-12 00:06:41 -0400 (Fri, 12 Jun 2009)
New Revision: 11134
Modified:
branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
Log:
leverage mapping configuration for more concise dependency metdata (thanks to Jason Porter)
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 04:00:12 UTC (rev 11133)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2009-06-12 04:06:41 UTC (rev 11134)
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<project basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" name="@projectName@-ivy">
- <!-- At this point we cannot upgrade to 2.0.0-rc1 because of a bug regarding when the variables are loaded -->
- <property name="ivy.install.version" value="2.0.0-beta2"/>
+ <property name="ivy.install.version" value="2.0.0"/>
<property name="ivy.jar.dir" value="${lib.dir}/ivy"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<property name="ivy.sync" value="false"/>
@@ -10,7 +9,7 @@
<property name="jboss.repo" value="http://repository.jboss.org/maven2"/>
<!-- centralize some key artifact versions -->
- <property name="seam.version" value="2.1.1.GA"/>
+ <property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.0.GA"/>
<property name="jboss-embedded.version" value="beta3"/>
@@ -35,15 +34,16 @@
</target>
<target name="inflate-core" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="default"/>
+ <move file="${lib.dir}/mvel.jar" tofile="${lib.dir}/mvel14.jar" failonerror="false"/>
</target>
<target name="inflate-source" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]" type="source" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]" type="source" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="sources"/>
</target>
<target name="inflate-test" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]" type="test-jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]" type="test-jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="test"/>
</target>
<target name="inflate" depends="inflate-core,inflate-source,inflate-test"/>
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml 2009-06-12 04:00:12 UTC (rev 11133)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml 2009-06-12 04:06:41 UTC (rev 11134)
@@ -3,11 +3,10 @@
<settings defaultResolver="seam"/>
<include url="${ivy.default.settings.dir}/ivysettings.xml" />
<resolvers>
- <ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <chain name="seam" returnFirst="true">
- <!-- local is always checked; central is before jboss since Ivy will only get sources from where it got binaries -->
- <resolver ref="central"/>
+ <ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <chain name="seam" dual="true">
+ <!-- local is always checked; public needs to be before jboss to allow Ivy to properly locate sources -->
+ <resolver ref="public"/>
<resolver ref="jboss"/>
</chain>
</resolvers>
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2009-06-12 04:00:12 UTC (rev 11133)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2009-06-12 04:06:41 UTC (rev 11134)
@@ -1,152 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="@projectName@" module="@projectName@"/>
- <configurations>
+ <configurations defaultconfmapping="default->default;sources->sources;test->default">
+ <conf name="sources" transitive="false" visibility="private"/>
+ <conf name="test" transitive="false" visibility="private"/>
<conf name="default" transitive="false"/>
</configurations>
<dependencies defaultconf="default">
- <!-- Add your JDBC driver dependence here if you need it -->
- <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1">
- <artifact name="jsf-facelets" type="jar"/>
- <artifact name="jsf-facelets" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0">
- <artifact name="commons-beanutils" type="jar"/>
- <artifact name="commons-beanutils" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="commons-digester" name="commons-digester" rev="1.7">
- <artifact name="commons-digester" type="jar"/>
- <artifact name="commons-digester" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="janino" name="janino" rev="2.5.10">
- <artifact name="janino" type="jar"/>
- </dependency>
- <dependency org="javax.ejb" name="ejb-api" rev="3.0">
- <artifact name="ejb-api" type="jar"/>
- </dependency>
- <dependency org="javax.el" name="el-api" rev="1.0">
- <artifact name="el-api" type="jar"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-api" rev="${jsf.version}">
- <artifact name="jsf-api" type="jar"/>
- <artifact name="jsf-api" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-impl" rev="${jsf.version}">
- <artifact name="jsf-impl" type="jar"/>
- <artifact name="jsf-impl" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="javax.persistence" name="persistence-api" rev="1.0">
- <artifact name="persistence-api" type="jar"/>
- </dependency>
- <dependency org="javax.servlet" name="servlet-api" rev="2.5">
- <artifact name="servlet-api" type="jar"/>
- </dependency>
- <dependency org="javax.transaction" name="jta" rev="1.1">
- <artifact name="jta" type="jar"/>
- </dependency>
- <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam">
- <artifact name="jxl" type="jar"/>
- </dependency>
- <dependency org="org.antlr" name="antlr-runtime" rev="3.0">
- <artifact name="antlr-runtime" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-api" rev="5.0.1">
- <artifact name="drools-api" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-compiler" rev="5.0.1">
- <artifact name="drools-compiler" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-core" rev="5.0.1">
- <artifact name="drools-core" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-decisiontables" rev="5.0.1">
- <artifact name="drools-decisiontables" type="jar"/>
- </dependency>
- <dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x">
- <artifact name="core" type="jar"/>
- </dependency>
- <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4">
- <artifact name="groovy-all" type="jar"/>
- </dependency>
- <dependency org="org.hibernate" name="hibernate-validator" rev="3.0.0.GA">
- <artifact name="hibernate-validator" type="jar"/>
- </dependency>
- <dependency org="org.jboss.el" name="jboss-el" rev="1.0_02.CR3">
- <artifact name="jboss-el" type="jar"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam" rev="${seam.version}">
- <artifact name="jboss-seam" type="jar"/>
+ <!-- Add your JDBC driver dependency here if you need it -->
+ <!--
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.8-brew" conf="default"/>
+ -->
+ <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1" conf="default,sources"/>
+ <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" conf="default,sources"/>
+ <dependency org="commons-digester" name="commons-digester" rev="1.7" conf="default,sources"/>
+ <dependency org="janino" name="janino" rev="2.5.10" conf="default"/>
+ <dependency org="javax.ejb" name="ejb-api" rev="3.0" conf="default"/>
+ <dependency org="javax.el" name="el-api" rev="1.0" conf="default"/>
+ <dependency org="javax.faces" name="jsf-api" rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.faces" name="jsf-impl" rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="default"/>
+ <dependency org="javax.transaction" name="jta" rev="1.1" conf="default"/>
+ <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam" conf="default"/>
+ <dependency org="org.antlr" name="antlr-runtime" rev="3.0" conf="default"/>
+ <dependency org="org.drools" name="drools-api" rev="5.0.1" conf="default"/>
+ <dependency org="org.drools" name="drools-compiler" rev="5.0.1" conf="default"/>
+ <dependency org="org.drools" name="drools-core" rev="5.0.1" conf="default"/>
+ <dependency org="org.drools" name="drools-decisiontables" rev="5.0.1" conf="default"/>
+ <dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x" conf="default"/>
+ <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4" conf="default"/>
+ <dependency org="org.hibernate" name="hibernate-validator" rev="3.0.0.GA" conf="default"/>
+ <dependency org="org.jboss.el" name="jboss-el" rev="1.0_02.CR3" conf="default"/>
+ <!-- Seam jar is a special case because it's an EJB type and Ivy (at least right now)
+ believes the extension should be ejb, so we have to tell it the correct one. -->
+ <dependency org="org.jboss.seam" name="jboss-seam" rev="${seam.version}" conf="default,sources">
+ <artifact name="jboss-seam" type="jar" ext="jar"/>
<artifact name="jboss-seam" type="source" ext="jar" m:classifier="sources"/>
</dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-debug" rev="${seam.version}">
- <artifact name="jboss-seam-debug" type="jar"/>
- <artifact name="jboss-seam-debug" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-excel" rev="${seam.version}">
- <artifact name="jboss-seam-excel" type="jar"/>
- <artifact name="jboss-seam-excel" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ioc" rev="${seam.version}">
- <artifact name="jboss-seam-ioc" type="jar"/>
- <artifact name="jboss-seam-ioc" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-jul" rev="${seam.version}">
- <artifact name="jboss-seam-jul" type="jar"/>
- <artifact name="jboss-seam-jul" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-mail" rev="${seam.version}">
- <artifact name="jboss-seam-mail" type="jar"/>
- <artifact name="jboss-seam-mail" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-pdf" rev="${seam.version}">
- <artifact name="jboss-seam-pdf" type="jar"/>
- <artifact name="jboss-seam-pdf" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-remoting" rev="${seam.version}">
- <artifact name="jboss-seam-remoting" type="jar"/>
- <artifact name="jboss-seam-remoting" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-rss" rev="${seam.version}">
- <artifact name="jboss-seam-rss" type="jar"/>
- <artifact name="jboss-seam-rss" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ui" rev="${seam.version}">
- <artifact name="jboss-seam-ui" type="jar"/>
- <artifact name="jboss-seam-ui" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2">
- <artifact name="jbpm-jpdl" type="jar"/>
- </dependency>
- <dependency org="org.mvel" name="mvel2" rev="2.0.10">
- <artifact name="mvel2" type="jar"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}">
- <artifact name="richfaces-api" type="jar"/>
- <artifact name="richfaces-api" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-impl" rev="${richfaces.version}">
- <artifact name="richfaces-impl" type="jar"/>
- <artifact name="richfaces-impl" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.ui" name="richfaces-ui" rev="${richfaces.version}">
- <artifact name="richfaces-ui" type="jar"/>
- <artifact name="richfaces-ui" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.testng" name="testng" rev="5.6">
- <artifact name="testng" type="jar"/>
- </dependency>
- <!-- I tried to use conf="test" but I simply didn't understand how it worked -->
- <dependency org="org.jboss.seam.embedded" name="hibernate-all" rev="${jboss-embedded.version}">
- <artifact name="hibernate-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="thirdparty-all" rev="${jboss-embedded.version}">
- <artifact name="thirdparty-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="jboss-embedded-all" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="jboss-embedded-api" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-api" type="test-jar" ext="jar"/>
- </dependency>
+ <dependency org="org.jboss.seam" name="jboss-seam-debug" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-excel" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ioc" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-jul" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-mail" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-pdf" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-remoting" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-rss" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ui" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2" conf="default"/>
+ <dependency org="org.mvel" name="mvel2" rev="2.0.10" conf="default"/>
+ <dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.framework" name="richfaces-impl" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.ui" name="richfaces-ui" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.samples" name="glassX" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="darkX" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="laguna" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.testng" name="testng" rev="5.6" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="hibernate-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="thirdparty-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="jboss-embedded-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="jboss-embedded-api" rev="${jboss-embedded.version}" conf="test"/>
</dependencies>
</ivy-module>
15 years, 5 months
Seam SVN: r11133 - branches/community/Seam_2_1/seam-gen/ivy.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2009-06-12 00:00:12 -0400 (Fri, 12 Jun 2009)
New Revision: 11133
Modified:
branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml
branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml
branches/community/Seam_2_1/seam-gen/ivy/ivy.xml
Log:
leverage configuration mappings to make dependency metadata more concise (thanks to Jason Porter)
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml 2009-06-11 23:30:25 UTC (rev 11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy-build.xml 2009-06-12 04:00:12 UTC (rev 11133)
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<project basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" name="@projectName@-ivy">
- <!-- At this point we cannot upgrade to 2.0.0-rc1 because of a bug regarding when the variables are loaded -->
- <property name="ivy.install.version" value="2.0.0-beta2"/>
+ <property name="ivy.install.version" value="2.0.0"/>
<property name="ivy.jar.dir" value="${lib.dir}/ivy"/>
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
<property name="ivy.sync" value="false"/>
@@ -10,7 +9,7 @@
<property name="jboss.repo" value="http://repository.jboss.org/maven2"/>
<!-- centralize some key artifact versions -->
- <property name="seam.version" value="2.1.1.GA"/>
+ <property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
<property name="richfaces.version" value="3.3.0.GA"/>
<property name="jboss-embedded.version" value="beta3"/>
@@ -35,16 +34,16 @@
</target>
<target name="inflate-core" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/[artifact].[ext]" type="jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="default"/>
<move file="${lib.dir}/mvel.jar" tofile="${lib.dir}/mvel14.jar" failonerror="false"/>
</target>
<target name="inflate-source" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]" type="source" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/src/[artifact]-[type]s.[ext]" type="source" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="sources"/>
</target>
<target name="inflate-test" depends="load-ivy">
- <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]" type="test-jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}"/>
+ <ivy:retrieve pattern="${lib.dir}/test/[artifact].[ext]" type="test-jar" sync="${ivy.sync}" symlink="${ivy.use.symlinks}" conf="test"/>
</target>
<target name="inflate" depends="inflate-core,inflate-source,inflate-test"/>
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml 2009-06-11 23:30:25 UTC (rev 11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy.settings.xml 2009-06-12 04:00:12 UTC (rev 11133)
@@ -3,11 +3,10 @@
<settings defaultResolver="seam"/>
<include url="${ivy.default.settings.dir}/ivysettings.xml" />
<resolvers>
- <ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <chain name="seam" returnFirst="true">
- <!-- local is always checked; central is before jboss since Ivy will only get sources from where it got binaries -->
- <resolver ref="central"/>
+ <ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <chain name="seam" dual="true">
+ <!-- local is always checked; public needs to be before jboss to allow Ivy to properly locate sources -->
+ <resolver ref="public"/>
<resolver ref="jboss"/>
</chain>
</resolvers>
Modified: branches/community/Seam_2_1/seam-gen/ivy/ivy.xml
===================================================================
--- branches/community/Seam_2_1/seam-gen/ivy/ivy.xml 2009-06-11 23:30:25 UTC (rev 11132)
+++ branches/community/Seam_2_1/seam-gen/ivy/ivy.xml 2009-06-12 04:00:12 UTC (rev 11133)
@@ -1,146 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="@projectName@" module="@projectName@"/>
- <configurations>
+ <configurations defaultconfmapping="default->default;sources->sources;test->default">
+ <conf name="sources" transitive="false" visibility="private"/>
+ <conf name="test" transitive="false" visibility="private"/>
<conf name="default" transitive="false"/>
</configurations>
<dependencies defaultconf="default">
- <!-- Add your JDBC driver dependence here if you need it -->
- <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1">
- <artifact name="jsf-facelets" type="jar"/>
- <artifact name="jsf-facelets" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0">
- <artifact name="commons-beanutils" type="jar"/>
- <artifact name="commons-beanutils" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="commons-digester" name="commons-digester" rev="1.7">
- <artifact name="commons-digester" type="jar"/>
- <artifact name="commons-digester" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="janino" name="janino" rev="2.5.10">
- <artifact name="janino" type="jar"/>
- </dependency>
- <dependency org="javax.ejb" name="ejb-api" rev="3.0">
- <artifact name="ejb-api" type="jar"/>
- </dependency>
- <dependency org="javax.el" name="el-api" rev="1.0">
- <artifact name="el-api" type="jar"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-api" rev="${jsf.version}">
- <artifact name="jsf-api" type="jar"/>
- <artifact name="jsf-api" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="javax.faces" name="jsf-impl" rev="${jsf.version}">
- <artifact name="jsf-impl" type="jar"/>
- <artifact name="jsf-impl" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="javax.persistence" name="persistence-api" rev="1.0">
- <artifact name="persistence-api" type="jar"/>
- </dependency>
- <dependency org="javax.servlet" name="servlet-api" rev="2.5">
- <artifact name="servlet-api" type="jar"/>
- </dependency>
- <dependency org="javax.transaction" name="jta" rev="1.1">
- <artifact name="jta" type="jar"/>
- </dependency>
- <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam">
- <artifact name="jxl" type="jar"/>
- </dependency>
- <dependency org="org.antlr" name="antlr-runtime" rev="3.0">
- <artifact name="antlr-runtime" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-compiler" rev="4.0.4">
- <artifact name="drools-compiler" type="jar"/>
- </dependency>
- <dependency org="org.drools" name="drools-core" rev="4.0.4">
- <artifact name="drools-core" type="jar"/>
- </dependency>
- <dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x">
- <artifact name="core" type="jar"/>
- </dependency>
- <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4">
- <artifact name="groovy-all" type="jar"/>
- </dependency>
- <dependency org="org.hibernate" name="hibernate-validator" rev="3.0.0.GA">
- <artifact name="hibernate-validator" type="jar"/>
- </dependency>
- <dependency org="org.jboss.el" name="jboss-el" rev="1.0_02.CR3">
- <artifact name="jboss-el" type="jar"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam" rev="${seam.version}">
- <artifact name="jboss-seam" type="jar"/>
+ <!-- Add your JDBC driver dependency here if you need it -->
+ <!--
+ <dependency org="hsqldb" name="hsqldb" rev="1.8.0.8-brew" conf="default"/>
+ -->
+ <dependency org="com.sun.facelets" name="jsf-facelets" rev="1.1.15.B1" conf="default,sources"/>
+ <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" conf="default,sources"/>
+ <dependency org="commons-digester" name="commons-digester" rev="1.7" conf="default,sources"/>
+ <dependency org="janino" name="janino" rev="2.5.10" conf="default"/>
+ <dependency org="javax.ejb" name="ejb-api" rev="3.0" conf="default"/>
+ <dependency org="javax.el" name="el-api" rev="1.0" conf="default"/>
+ <dependency org="javax.faces" name="jsf-api" rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.faces" name="jsf-impl" rev="${jsf.version}" conf="default,sources"/>
+ <dependency org="javax.persistence" name="persistence-api" rev="1.0" conf="default"/>
+ <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="default"/>
+ <dependency org="javax.transaction" name="jta" rev="1.1" conf="default"/>
+ <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam" conf="default"/>
+ <dependency org="org.antlr" name="antlr-runtime" rev="3.0" conf="default"/>
+ <dependency org="org.drools" name="drools-compiler" rev="4.0.4" conf="default"/>
+ <dependency org="org.drools" name="drools-core" rev="4.0.4" conf="default"/>
+ <dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x" conf="default"/>
+ <dependency org="org.codehaus.groovy" name="groovy-all" rev="1.5.4" conf="default"/>
+ <dependency org="org.hibernate" name="hibernate-validator" rev="3.0.0.GA" conf="default"/>
+ <dependency org="org.jboss.el" name="jboss-el" rev="1.0_02.CR3" conf="default"/>
+ <!-- Seam jar is a special case because it's an EJB type and Ivy (at least right now)
+ believes the extension should be ejb, so we have to tell it the correct one. -->
+ <dependency org="org.jboss.seam" name="jboss-seam" rev="${seam.version}" conf="default,sources">
+ <artifact name="jboss-seam" type="jar" ext="jar"/>
<artifact name="jboss-seam" type="source" ext="jar" m:classifier="sources"/>
</dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-debug" rev="${seam.version}">
- <artifact name="jboss-seam-debug" type="jar"/>
- <artifact name="jboss-seam-debug" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-excel" rev="${seam.version}">
- <artifact name="jboss-seam-excel" type="jar"/>
- <artifact name="jboss-seam-excel" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ioc" rev="${seam.version}">
- <artifact name="jboss-seam-ioc" type="jar"/>
- <artifact name="jboss-seam-ioc" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-jul" rev="${seam.version}">
- <artifact name="jboss-seam-jul" type="jar"/>
- <artifact name="jboss-seam-jul" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-mail" rev="${seam.version}">
- <artifact name="jboss-seam-mail" type="jar"/>
- <artifact name="jboss-seam-mail" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-pdf" rev="${seam.version}">
- <artifact name="jboss-seam-pdf" type="jar"/>
- <artifact name="jboss-seam-pdf" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-remoting" rev="${seam.version}">
- <artifact name="jboss-seam-remoting" type="jar"/>
- <artifact name="jboss-seam-remoting" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-rss" rev="${seam.version}">
- <artifact name="jboss-seam-rss" type="jar"/>
- <artifact name="jboss-seam-rss" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jboss.seam" name="jboss-seam-ui" rev="${seam.version}">
- <artifact name="jboss-seam-ui" type="jar"/>
- <artifact name="jboss-seam-ui" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2">
- <artifact name="jbpm-jpdl" type="jar"/>
- </dependency>
- <dependency org="org.mvel" name="mvel14" rev="1.2.21">
- <artifact name="mvel14" type="jar"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}">
- <artifact name="richfaces-api" type="jar"/>
- <artifact name="richfaces-api" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.framework" name="richfaces-impl" rev="${richfaces.version}">
- <artifact name="richfaces-impl" type="jar"/>
- <artifact name="richfaces-impl" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.richfaces.ui" name="richfaces-ui" rev="${richfaces.version}">
- <artifact name="richfaces-ui" type="jar"/>
- <artifact name="richfaces-ui" type="source" ext="jar" m:classifier="sources"/>
- </dependency>
- <dependency org="org.testng" name="testng" rev="5.6">
- <artifact name="testng" type="jar"/>
- </dependency>
- <!-- I tried to use conf="test" but I simply didn't understand how it worked -->
- <dependency org="org.jboss.seam.embedded" name="hibernate-all" rev="${jboss-embedded.version}">
- <artifact name="hibernate-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="thirdparty-all" rev="${jboss-embedded.version}">
- <artifact name="thirdparty-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="jboss-embedded-all" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-all" type="test-jar" ext="jar"/>
- </dependency>
- <dependency org="org.jboss.seam.embedded" name="jboss-embedded-api" rev="${jboss-embedded.version}">
- <artifact name="jboss-embedded-api" type="test-jar" ext="jar"/>
- </dependency>
+ <dependency org="org.jboss.seam" name="jboss-seam-debug" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-excel" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ioc" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-jul" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-mail" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-pdf" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-remoting" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-rss" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jboss.seam" name="jboss-seam-ui" rev="${seam.version}" conf="default,sources"/>
+ <dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2" conf="default"/>
+ <dependency org="org.mvel" name="mvel14" rev="1.2.21" conf="default"/>
+ <dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.framework" name="richfaces-impl" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.ui" name="richfaces-ui" rev="${richfaces.version}" conf="default,sources"/>
+ <dependency org="org.richfaces.samples" name="glassX" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="darkX" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.richfaces.samples" name="laguna" rev="${richfaces.version}" conf="default"/>
+ <dependency org="org.testng" name="testng" rev="5.6" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="hibernate-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="thirdparty-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="jboss-embedded-all" rev="${jboss-embedded.version}" conf="test"/>
+ <dependency org="org.jboss.seam.embedded" name="jboss-embedded-api" rev="${jboss-embedded.version}" conf="test"/>
</dependencies>
</ivy-module>
15 years, 5 months