Seam SVN: r13314 - branches/community/Seam_2_2/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-06-28 14:06:58 -0400 (Mon, 28 Jun 2010)
New Revision: 13314
Modified:
branches/community/Seam_2_2/build/root.pom.xml
Log:
upgraded spring to 2.5.6.SEC02 JBSEAM-3035
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2010-06-28 13:18:16 UTC (rev 13313)
+++ branches/community/Seam_2_2/build/root.pom.xml 2010-06-28 18:06:58 UTC (rev 13314)
@@ -43,7 +43,7 @@
<version.drools>5.0.1</version.drools>
<version.testng>5.10</version.testng>
<version.resteasy>2.0-beta-2</version.resteasy>
- <version.spring>2.5.6.SEC01</version.spring>
+ <version.spring>2.5.6.SEC02</version.spring>
</properties>
<dependencyManagement>
13 years, 10 months
Seam SVN: r13313 - branches/community/Seam_2_2/seam-gen/view/stylesheet.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-06-28 09:18:16 -0400 (Mon, 28 Jun 2010)
New Revision: 13313
Modified:
branches/community/Seam_2_2/seam-gen/view/stylesheet/theme.xcss
Log:
JBSEAM-4444
Modified: branches/community/Seam_2_2/seam-gen/view/stylesheet/theme.xcss
===================================================================
--- branches/community/Seam_2_2/seam-gen/view/stylesheet/theme.xcss 2010-06-27 11:51:52 UTC (rev 13312)
+++ branches/community/Seam_2_2/seam-gen/view/stylesheet/theme.xcss 2010-06-28 13:18:16 UTC (rev 13313)
@@ -16,7 +16,7 @@
<u:selector name="a:hover">
<u:style name="color" skin="hoverLinkColor"/>
</u:selector>
- <u:selector name="input[type=text], input[type=password], textarea, select">
+ <u:selector name="input[type=text]:not([class*=rich-combobox-button]), input[type=password], textarea, select">
<u:style name="background-color" skin="controlBackgroundColor"/>
<u:style name="color" skin="controlTextColor"/>
<u:style name="background-position" value="left top"/>
13 years, 10 months
Seam SVN: r13311 - in modules/security/trunk/examples/idmconsole/src/main/webapp: WEB-INF/templates and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-27 07:51:11 -0400 (Sun, 27 Jun 2010)
New Revision: 13311
Removed:
modules/security/trunk/examples/idmconsole/src/main/webapp/resources/
Modified:
modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css
Log:
more styling
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-27 10:38:16 UTC (rev 13310)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-27 11:51:11 UTC (rev 13311)
@@ -10,6 +10,12 @@
</h:head>
<h:body>
<div id="container">
+ <div id="header">
+ <div id="title">
+ Identity Management Console
+ </div>
+ </div>
+
<div id="sidebar">
<ui:insert name="sidebar"/>
</div>
@@ -17,10 +23,6 @@
<div id="content">
<ui:insert name="content"/>
</div>
-
- <div id="footer">
- <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/>
- </div>
</div>
</h:body>
</html>
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-27 10:38:16 UTC (rev 13310)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-27 11:51:11 UTC (rev 13311)
@@ -10,7 +10,6 @@
</ui:define>
<ui:define name="content">
- <h2>Identity Management Console</h2>
<p>This example demonstrates Seam's identity management features, backed by PicketLink IDM.</p>
<h:form id="loginForm" rendered="#{not identity.loggedIn}">
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css 2010-06-27 10:38:16 UTC (rev 13310)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/style/default.css 2010-06-27 11:51:11 UTC (rev 13311)
@@ -6,13 +6,24 @@
font-size: 0.9em;
}
+div#header {
+ height: 80px;
+ background-color: #eeeeee;
+}
+
+div#title {
+ padding-top: 22px;
+ font-size: 22px;
+ font-weight: bold;
+ margin-left: 180px;
+}
+
div#container {
margin: 0px auto;
- padding: 2px 2px 2px 2px;
+ padding: 2px 2px 2px 4px;
border: 1px solid #666666;
- width: 865px; /* subtract 40px from banner width for padding */
- background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
- padding-top: 110px;
+ width: 865px;
+ background: #FFFFFF;
}
div#sidebar {
@@ -21,7 +32,8 @@
float: left;
border: 1px solid #666666;
background: #EAECEE;
- padding: 4px 4px 4px 4px;
+ padding: 4px 4px 24px 4px;
+ margin-top: 8px;
}
div#content {
@@ -29,12 +41,4 @@
margin-left: 180px;
}
-#footer {
- margin-top: 12px;
- clear: both;
- text-align: center;
- color: #666666;
- font-size: 0.85em;
-}
-
13 years, 10 months
Seam SVN: r13310 - in modules/security/trunk/examples/idmconsole/src/main/webapp: resources and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-27 06:38:16 -0400 (Sun, 27 Jun 2010)
New Revision: 13310
Added:
modules/security/trunk/examples/idmconsole/src/main/webapp/style/
Removed:
modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/
Log:
move style dir
Copied: modules/security/trunk/examples/idmconsole/src/main/webapp/style (from rev 13309, modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style)
13 years, 10 months
Seam SVN: r13309 - in modules/security/trunk/examples/idmconsole/src/main/webapp: WEB-INF/templates and 2 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-27 06:34:12 -0400 (Sun, 27 Jun 2010)
New Revision: 13309
Added:
modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/
modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/default.css
Removed:
modules/security/trunk/examples/idmconsole/src/main/webapp/resources/css/
Modified:
modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
Log:
styling
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-27 07:18:55 UTC (rev 13308)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-27 10:34:12 UTC (rev 13309)
@@ -3,22 +3,24 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <h:head>
- <title>Java EE 6 Starter Application</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <h:outputStylesheet name="css/screen.css"/>
- </h:head>
- <h:body>
- <div id="container">
- <div id="content">
-
- <ui:insert name="content">
- [Template content will be inserted here]
- </ui:insert>
- </div>
- <div id="footer">
- <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/>
- </div>
+ <h:head>
+ <title>Java EE 6 Starter Application</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />
+ </h:head>
+ <h:body>
+ <div id="container">
+ <div id="sidebar">
+ <ui:insert name="sidebar"/>
</div>
- </h:body>
+
+ <div id="content">
+ <ui:insert name="content"/>
+ </div>
+
+ <div id="footer">
+ <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/>
+ </div>
+ </div>
+ </h:body>
</html>
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-27 07:18:55 UTC (rev 13308)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-27 10:34:12 UTC (rev 13309)
@@ -4,6 +4,11 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
template="/WEB-INF/templates/default.xhtml">
+
+ <ui:define name="sidebar">
+ <ui:include src="menu.xhtml"/>
+ </ui:define>
+
<ui:define name="content">
<h2>Identity Management Console</h2>
<p>This example demonstrates Seam's identity management features, backed by PicketLink IDM.</p>
Added: modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/default.css
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/default.css (rev 0)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/resources/style/default.css 2010-06-27 10:34:12 UTC (rev 13309)
@@ -0,0 +1,40 @@
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #EAECEE;
+ font-family: Verdana, sans-serif;
+ font-size: 0.9em;
+}
+
+div#container {
+ margin: 0px auto;
+ padding: 2px 2px 2px 2px;
+ border: 1px solid #666666;
+ width: 865px; /* subtract 40px from banner width for padding */
+ background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
+ padding-top: 110px;
+}
+
+div#sidebar {
+ font-size: 0.9em;
+ width: 160px;
+ float: left;
+ border: 1px solid #666666;
+ background: #EAECEE;
+ padding: 4px 4px 4px 4px;
+}
+
+div#content {
+ padding: 4px 4px 4px 4px;
+ margin-left: 180px;
+}
+
+#footer {
+ margin-top: 12px;
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
+}
+
+
13 years, 10 months
Seam SVN: r13308 - in modules/xml/trunk: examples/princess-rescue/src/main/resources/META-INF and 13 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-06-27 03:18:55 -0400 (Sun, 27 Jun 2010)
New Revision: 13308
Modified:
modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml
Log:
changed root namespace to urn:java:ee
Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -23,7 +23,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
+ xmlns:s="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
<test:ProducerQualifier>
@@ -50,9 +50,9 @@
</programlisting>
<para>You will notice that two new namspace declarations have been added to the
- <literal>beans.xml</literal> file: <literal>urn:java:seam:core</literal> and
+ <literal>beans.xml</literal> file: <literal>urn:java:ee</literal> and
<literal>urn:java:org.jboss.seam.xml.test.injection</literal>. The
- <literal>urn:java:seam:core</literal> namespace is the main one used by the XML
+ <literal>urn:java:ee</literal> namespace is the main one used by the XML
extension, we will cover exactly what lives in this namespace later. The
<literal>urn:java:org.jboss.seam.xml.test.injection</literal> namespace is used
to resolve classes in the java package <literal>org.jboss.seam.xml.test.injection</literal>,
@@ -136,7 +136,7 @@
<section>
<title>XML Namespaces</title>
- <para>The main namesapce is <literal>urn:java:seam:core</literal> contains builtin tags and types from core packages.
+ <para>The main namesapce is <literal>urn:java:ee</literal> contains builtin tags and types from core packages.
The builting tags are:</para>
<itemizedlist>
@@ -287,7 +287,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
+ xmlns:s="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.method">
<test:MethodBean>
Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -85,7 +85,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
+ xmlns:s="urn:java:ee"
xmlns:r="urn:java:org.example.reports">
<r:Report>
@@ -110,7 +110,7 @@
</programlisting>
<calloutlist>
<callout arearefs="namepsace-declaration-seam">
- <para>The namespace <literal>urn:java:seam:core</literal> is seam-xml's root namespace. This is where the builtin tags and CDI annotations live.</para>
+ <para>The namespace <literal>urn:java:ee</literal> is seam-xml's root namespace. This is where the builtin tags and CDI annotations live.</para>
</callout>
<callout arearefs="namepsace-declaration-reports">
<para>The namespace <literal>urn:java:org.example.reports</literal> corresponds to the package <literal>org.example.reports</literal>, where our reporting classes live.</para>
Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
+ xmlns:s="urn:java:ee"
xmlns:p="org.jboss.seam.xml.examples.princess"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:18:55 UTC (rev 13308)
@@ -64,7 +64,7 @@
final AnnotationInstanceProvider ac = new AnnotationInstanceProvider();
- static final String ROOT_NAMESPACE = "urn:java:seam:core";
+ static final String ROOT_NAMESPACE = "urn:java:ee";
static final String BEANS_ROOT_NAMESPACE = "http://java.sun.com/xml/ns/javaee";
Modified: modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/META-INF/beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,6 +1,6 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
+ xmlns:s="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://docs.jboss.org/cdi/beans_1_0.xsd">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/constructor/constructor-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.constructor">
<test:ValueProvider>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:ArrayFieldValue>
<overrides/>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:CollectionFieldValue>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:MapFieldValue>
<overrides/>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
<test:FieldValueBean>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.generic">
<genericBean class="org.jboss.seam.xml.test.generic.GenericMain" >
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/iface/interface-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.iface">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
<test:OtherQualifier>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
<test:InterceptedBean>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
+<beans xmlns="urn:java:ee" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/method/primitive-method-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.method">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.producer">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/stereotype/stereotype-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.stereotype"
xmlns:int="urn:java:org.jboss.seam.xml.test.interceptor">
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/types/types-test-beans.xml 2010-06-27 07:18:55 UTC (rev 13308)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="urn:java:seam:core"
+<beans xmlns="urn:java:ee"
xmlns:test="urn:java:org.jboss.seam.xml.test.types">
13 years, 10 months
Seam SVN: r13307 - in modules/xml/trunk: examples/princess-rescue and 5 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-06-27 03:14:41 -0400 (Sun, 27 Jun 2010)
New Revision: 13307
Added:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java
Removed:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java
Modified:
modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
modules/xml/trunk/examples/princess-rescue/pom.xml
modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
Log:
rename <specialises> to <extends>
Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-general.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -141,7 +141,7 @@
<itemizedlist>
<listitem><para><literal>Beans</literal></para></listitem>
- <listitem><para><literal>specializes</literal></para></listitem>
+ <listitem><para><literal>extends</literal></para></listitem>
<listitem><para><literal>overrides</literal></para></listitem>
<listitem><para><literal>parameters</literal></para></listitem>
<listitem><para><literal>value</literal></para></listitem>
@@ -193,16 +193,16 @@
<para>By configuring a bean via XML creates a new bean, however there
may be cases where you want to modify an existing bean rather than
adding a new one. The <literal><s:overrides></literal> and
- <literal><s:specializes></literal> tags allow you to do this.</para>
+ <literal><s:extends></literal> tags allow you to do this.</para>
<para>The <literal><s:overrides></literal> tag prevents the existing bean from being
installed, and registers a new one with the given configuration. The
- <literal><s:specializes></literal> tag does the same, except that it merges
+ <literal><s:extends></literal> tag does the same, except that it merges
the annotations on the bean with the annotations defined in XML. This has the
same effect as modifiying an existing bean.</para>
<programlisting role="XML"><![CDATA[
<test:Report>
- <s:specializes>
+ <s:extends>
<test:NewQualifier/>
</test:Report>
@@ -491,7 +491,7 @@
<s:genericBean class="org.jboss.seam.xml.test.generic.GenericMain" >
<test:GenericDependant>
<s:ApplyQualifiers/>
- <s:specializes/>
+ <s:extends/>
<test:instance>
<s:ApplyQualifiers/>
</test:instance>
Modified: modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml
===================================================================
--- modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/docs/src/main/docbook/en-US/xml-introduction.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -18,9 +18,9 @@
<listitem><literal>/META-INF/seam-beans.xml</literal></listitem>
<listitem><literal>/seam-beans.xml</literal></listitem>
</itemizedlist>
- <important>
+ <warning>
<para>It is currently not possible to load beans.xml from WEB-INF. This will be addressed before the final release of seam-xml.</para>
- </important>
+ </warning>
<para>The <literal>beans.xml</literal> file is the preferred way of configuring beans via XML, however it may be possible that some JSR-299 implementations will not allow this,
so <literal>seam-beans.xml</literal> is provided as an alternative. </para>
@@ -150,6 +150,10 @@
</programlistingco>
</section>
+ <section>
+ <title>The Princess Rescue Example</title>
+
+ </section>
<!--
vim:et:ts=3:sw=3:tw=120
-->
Modified: modules/xml/trunk/examples/princess-rescue/pom.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -57,13 +57,13 @@
<artifactId>jsf-impl</artifactId>
<scope>runtime</scope>
</dependency>
-
+ <!--
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
<artifactId>weld-servlet</artifactId>
<scope>runtime</scope>
</dependency>
-
+ -->
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>el-impl</artifactId>
Modified: modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml
===================================================================
--- modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/examples/princess-rescue/src/main/resources/META-INF/beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -13,7 +13,7 @@
</p:Room>
<p:GameManager>
- <s:specializes/>
+ <s:extends/>
<p:allRooms>
<s:Any/>
<s:Inject/>
Copied: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java (from rev 13171, modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java)
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java (rev 0)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ExtendsXmlItem.java 2010-06-27 07:14:41 UTC (rev 13307)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.xml.model;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class ExtendsXmlItem extends AbstractXmlItem
+{
+
+ public ExtendsXmlItem(XmlItem parent, String document, int lineno)
+ {
+ super(XmlItemType.EXTENDS, parent, null, null, null, document, lineno);
+
+ }
+
+ public Set<XmlItemType> getAllowedItem()
+ {
+ return Collections.emptySet();
+ }
+
+}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java 2010-06-27 07:14:41 UTC (rev 13307)
@@ -302,7 +302,7 @@
BeanResult<?> buildAnnotatedType(ClassXmlItem rb)
{
boolean override = !rb.getChildrenOfType(OverrideXmlItem.class).isEmpty();
- boolean extend = !rb.getChildrenOfType(SpecializesXmlItem.class).isEmpty();
+ boolean extend = !rb.getChildrenOfType(ExtendsXmlItem.class).isEmpty();
BeanResultType beanType = BeanResultType.ADD;
if (override && extend)
{
Deleted: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/SpecializesXmlItem.java 2010-06-27 07:14:41 UTC (rev 13307)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class SpecializesXmlItem extends AbstractXmlItem
-{
-
- public SpecializesXmlItem(XmlItem parent, String document, int lineno)
- {
- super(XmlItemType.SPECIALIZES, parent, null, null, null, document, lineno);
-
- }
-
- public Set<XmlItemType> getAllowedItem()
- {
- return Collections.emptySet();
- }
-
-}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/model/XmlItemType.java 2010-06-27 07:14:41 UTC (rev 13307)
@@ -23,5 +23,5 @@
public enum XmlItemType
{
- CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, SPECIALIZES, TYPE, GENERIC_BEAN;
+ CLASS, METHOD, FIELD, ANNOTATION, VALUE, ENTRY, KEY, DEPENDENCY, PARAMETERS, PARAMETER, ARRAY, OVERRIDE, EXTENDS, TYPE, GENERIC_BEAN;
}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java 2010-06-27 07:14:41 UTC (rev 13307)
@@ -29,7 +29,7 @@
import org.jboss.seam.xml.model.OverrideXmlItem;
import org.jboss.seam.xml.model.ParameterXmlItem;
import org.jboss.seam.xml.model.ParametersXmlItem;
-import org.jboss.seam.xml.model.SpecializesXmlItem;
+import org.jboss.seam.xml.model.ExtendsXmlItem;
import org.jboss.seam.xml.model.TypeXmlItem;
import org.jboss.seam.xml.model.ValueXmlItem;
import org.jboss.seam.xml.model.XmlItem;
@@ -79,9 +79,9 @@
{
return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());
}
- else if (item.equals("specializes"))
+ else if (item.equals("extends"))
{
- return new SpecializesXmlItem(parent, node.getDocument(), node.getLineNo());
+ return new ExtendsXmlItem(parent, node.getDocument(), node.getLineNo());
}
else if (item.equals("parameters"))
{
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -5,19 +5,19 @@
<genericBean class="org.jboss.seam.xml.test.generic.GenericMain" >
<test:GenericDependant>
<ApplyQualifiers/>
- <specializes/>
+ <extends/>
<test:instance>
<ApplyQualifiers/>
</test:instance>
</test:GenericDependant>
</genericBean>
- <test:GenericMain><specializes/>
+ <test:GenericMain><extends/>
<test:HighGenericQualifier/>
<test:configuredValue><value>100</value></test:configuredValue>
</test:GenericMain>
- <test:GenericMain><specializes/>
+ <test:GenericMain><extends/>
<test:LowGenericQualifier/>
<test:configuredValue><value>10</value></test:configuredValue>
</test:GenericMain>
Modified: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-25 11:50:36 UTC (rev 13306)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-06-27 07:14:41 UTC (rev 13307)
@@ -29,7 +29,7 @@
</test:OverriddenBean>
<test:ExtendedBean>
- <specializes/>
+ <extends/>
<test:ExtendedQualifier2/>
</test:ExtendedBean>
13 years, 10 months
Seam SVN: r13306 - modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-25 07:50:36 -0400 (Fri, 25 Jun 2010)
New Revision: 13306
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
Log:
more credential validation stuff
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-25 06:11:26 UTC (rev 13305)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-25 11:50:36 UTC (rev 13306)
@@ -1318,11 +1318,12 @@
criteria.where(predicates.toArray(new Predicate[0]));
- Query q = em.createQuery(criteria);
- List<?> results = q.getResultList();
+ List<?> results = em.createQuery(criteria).getResultList();
if (results.isEmpty()) return false;
+ // TODO this only supports plain text passwords
+
for (Object result : results)
{
Object val = credentialValue.getValue(result);
@@ -1332,10 +1333,25 @@
// or they're stored in the identity class
else
{
+ Property<?> identityNameProp = modelProperties.get(PROPERTY_IDENTITY_NAME);
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<?> criteria = builder.createQuery(credentialValue.getDeclaringClass());
+
+ Root<?> root = criteria.from(credentialValue.getDeclaringClass());
+
+ List<Predicate> predicates = new ArrayList<Predicate>();
+ predicates.add(builder.equal(root.get(identityNameProp.getName()),
+ identityObject.getName()));
+
+ criteria.where(predicates.toArray(new Predicate[0]));
+
+ Object result = em.createQuery(criteria).getSingleResult();
+
+ Object val = credentialValue.getValue(result);
+ if (val.equals(credential.getValue())) return true;
}
-
- // TODO Auto-generated method stub
+
return false;
}
13 years, 10 months
Seam SVN: r13305 - in modules/security/trunk: examples/idmconsole/src/main/webapp/WEB-INF/templates and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-06-25 02:11:26 -0400 (Fri, 25 Jun 2010)
New Revision: 13305
Modified:
modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
Log:
add credential type criteria to validateCredential()
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-25 04:50:50 UTC (rev 13304)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/WEB-INF/templates/default.xhtml 2010-06-25 06:11:26 UTC (rev 13305)
@@ -11,41 +11,13 @@
<h:body>
<div id="container">
<div id="content">
- <div id="sidebar">
- <h3>Find out more</h3>
- <p>
- Explore JavaServer Faces.
- </p>
- <ul>
- <li><a href="http://www.javaserverfaces.org">JSF community site</a></li>
- </ul>
- <p>
- Learn more about Java EE 6 and the extensions provided by Weld and Seam.
- </p>
- <ul>
- <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">Overview</a></li>
- <li><a href="http://seamframework.org">Project site</a></li>
- <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li>
- <li><a href="http://seamframework.org/Community/Forums">User forums</a></li>
- <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li>
- <li><a href="https://jira.jboss.org/jira/browse/WELD">Issue tracker</a></li>
- </ul>
- <p>
- If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and
- consider <a href="http://seamframework.org/Community/Contribute">contributing</a> it back to the
- community!
- </p>
- </div>
+
<ui:insert name="content">
[Template content will be inserted here]
</ui:insert>
</div>
<div id="footer">
<h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/>
- <p>
- This project was generated from a Maven archetype maintained by the Weld team.<br/>
- Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/>
- </p>
</div>
</div>
</h:body>
Modified: modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml
===================================================================
--- modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-25 04:50:50 UTC (rev 13304)
+++ modules/security/trunk/examples/idmconsole/src/main/webapp/home.xhtml 2010-06-25 06:11:26 UTC (rev 13305)
@@ -6,7 +6,7 @@
template="/WEB-INF/templates/default.xhtml">
<ui:define name="content">
<h2>Identity Management Console</h2>
- <p>This example demonstrates Seam's identity management features.</p>
+ <p>This example demonstrates Seam's identity management features, backed by PicketLink IDM.</p>
<h:form id="loginForm" rendered="#{not identity.loggedIn}">
<h:messages id="messages" globalOnly="true"/>
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-25 04:50:50 UTC (rev 13304)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java 2010-06-25 06:11:26 UTC (rev 13305)
@@ -1014,9 +1014,22 @@
criteria.where(predicates.toArray(new Predicate[0]));
- Query q = em.createQuery(criteria);
+ return em.createQuery(criteria).getSingleResult();
+ }
+
+ protected Object lookupCredentialType(String name, EntityManager em)
+ {
+ Property<?> credentialTypeNameProp = modelProperties.get(PROPERTY_CREDENTIAL_TYPE_NAME);
- return q.getSingleResult();
+ CriteriaBuilder builder = em.getCriteriaBuilder();
+ CriteriaQuery<?> criteria = builder.createQuery(credentialTypeNameProp.getDeclaringClass());
+ Root<?> root = criteria.from(credentialTypeNameProp.getDeclaringClass());
+
+ List<Predicate> predicates = new ArrayList<Predicate>();
+ predicates.add(builder.equal(root.get(credentialTypeNameProp.getName()), name));
+ criteria.where(predicates.toArray(new Predicate[0]));
+
+ return em.createQuery(criteria).getSingleResult();
}
protected Object lookupRelationshipType(IdentityObjectRelationshipType relationshipType)
@@ -1279,6 +1292,7 @@
if (credentialClass != null)
{
Property<?> credentialIdentity = modelProperties.get(PROPERTY_CREDENTIAL_IDENTITY);
+ Property<?> credentialType = modelProperties.get(PROPERTY_CREDENTIAL_TYPE);
CriteriaBuilder builder = em.getCriteriaBuilder();
CriteriaQuery<?> criteria = builder.createQuery(credentialClass);
@@ -1288,6 +1302,20 @@
predicates.add(builder.equal(root.get(credentialIdentity.getName()),
lookupIdentity(identityObject, em)));
+ if (credentialType != null)
+ {
+ if (String.class.equals(credentialType.getJavaClass()))
+ {
+ predicates.add(builder.equal(root.get(credentialType.getName()),
+ credential.getType().getName()));
+ }
+ else
+ {
+ predicates.add(builder.equal(root.get(credentialType.getName()),
+ lookupCredentialType(credential.getType().getName(), em)));
+ }
+ }
+
criteria.where(predicates.toArray(new Predicate[0]));
Query q = em.createQuery(criteria);
13 years, 10 months