JBoss Portal SVN: r9098 - modules/identity/branches.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 05:31:02 -0500 (Mon, 26 Nov 2007)
New Revision: 9098
Added:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/
Removed:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0_0/
Log:
Renaming the branch
Copied: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0 (from rev 9097, modules/identity/branches/JBP_IDENTITY_BRANCH_1_0_0)
18 years, 7 months
JBoss Portal SVN: r9097 - tools/docbook/styles/renaissance/en.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 05:13:51 -0500 (Mon, 26 Nov 2007)
New Revision: 9097
Modified:
tools/docbook/styles/renaissance/en/renaissance.css
Log:
Small update
Modified: tools/docbook/styles/renaissance/en/renaissance.css
===================================================================
--- tools/docbook/styles/renaissance/en/renaissance.css 2007-11-26 09:01:34 UTC (rev 9096)
+++ tools/docbook/styles/renaissance/en/renaissance.css 2007-11-26 10:13:51 UTC (rev 9097)
@@ -1,7 +1,8 @@
body {
font-family: Verdana, Arial, Helvetica, sans-serif;
- margin: 0;
+ margin: 40px;
padding: 0;
+ background-color: #fff;
}
a {
@@ -32,13 +33,18 @@
vertical-align:top;
}
+div.navfooter {
+ margin-top: 40px;
+}
+
div.navheader td[align=right] a,
div.navfooter td[align=right] a{
background-image: url( '../images/forward.png' );
background-repeat: no-repeat;
background-position: center right;
padding: 8px 35px 5px 0;
- margin:0;
+ color: white;
+ margin: 0;
}
div.navheader td[align=left] a,
@@ -47,6 +53,7 @@
background-repeat: no-repeat;
background-position: center left;
padding: 8px 0 5px 35px;
+ color: white;
margin:0;
}
18 years, 7 months
JBoss Portal SVN: r9096 - in branches/JBoss_Portal_Branch_2_6/build: etc/resources and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-26 04:01:34 -0500 (Mon, 26 Nov 2007)
New Revision: 9096
Modified:
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff
Log:
Minor
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-11-26 05:10:47 UTC (rev 9095)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-11-26 09:01:34 UTC (rev 9096)
@@ -154,7 +154,7 @@
<target name="patch-log4j">
<patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff"
- originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/>
+ originalfile="${todir}/conf/jboss-log4j.xml" />
</target>
<!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
Modified: branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff 2007-11-26 05:10:47 UTC (rev 9095)
+++ branches/JBoss_Portal_Branch_2_6/build/etc/resources/jboss-log4j.xml.diff 2007-11-26 09:01:34 UTC (rev 9096)
@@ -9,6 +9,6 @@
+ <priority value="ERROR"/>
+ </category>
+
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
- <category name="org.jboss.serial">
- <priority value="INFO"/>
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
18 years, 7 months
JBoss Portal SVN: r9095 - in branches/JBoss_Portal_Branch_2_6/wsrp/src: main/org/jboss/portal/wsrp/producer/config/impl and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-26 00:10:47 -0500 (Mon, 26 Nov 2007)
New Revision: 9095
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml
Log:
- Added support for old-style "xsd:string" type value.
- Corrected issue with fullServiceDescriptionRequiresRegistration not being declared on the proper element.
- Improvements to XSD.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-26 05:03:15 UTC (rev 9094)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-26 05:10:47 UTC (rev 9095)
@@ -49,6 +49,9 @@
private static final boolean DEBUG = false;
private boolean registrationDone = false;
+ // kept to support old-style type
+ private static final String LEGACY_XSD_STRING = "xsd:string";
+
public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
{
if (DEBUG)
@@ -156,10 +159,15 @@
else if ("type".equals(localName))
{
value = StringPropertyReplacer.replaceProperties(value);
- QName type = nav.resolveQName(value);
- if (!WSRPConstants.XSD_STRING.equals(type))
+
+ // first check that we still support type as "xsd:string"...
+ if (!LEGACY_XSD_STRING.equals(value))
{
- throw new IllegalArgumentException("'" + value + "' is not a supported type. Currently, only 'xsd:string' is supported.");
+ QName type = nav.resolveQName(value);
+ if (!WSRPConstants.XSD_STRING.equals(type))
+ {
+ throw new IllegalArgumentException("'" + value + "' is not a supported type. Currently, only 'xsd:string' is supported.");
+ }
}
desc.setType(WSRPConstants.XSD_STRING);
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2007-11-26 05:03:15 UTC (rev 9094)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2007-11-26 05:10:47 UTC (rev 9095)
@@ -183,7 +183,7 @@
marshaller.addRootElement("urn:jboss:portal:wsrp:producer:v2_6", "", "producer-configuration");
// declare default namespace
- marshaller.declareNamespace(null, "urn:jboss:portal:wsrp:producer:v2_6");
+ marshaller.declareNamespace("wpc", "urn:jboss:portal:wsrp:producer:v2_6");
// add schema location by declaring xsi namespace and adding xsi:schemaLocation attribute
marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-11-26 05:03:15 UTC (rev 9094)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-11-26 05:10:47 UTC (rev 9095)
@@ -25,16 +25,16 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:jboss:portal:wsrp:producer:v2_6"
xmlns="urn:jboss:portal:wsrp:producer:v2_6"
- xmlns:xml="http://www.w3.org/XML/1998/namespace">
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6">
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<xs:element name="producer-configuration">
<xs:complexType>
<xs:sequence>
- <xs:element name="registration-configuration" type="RegistrationConfiguration"/>
+ <xs:element name="registration-configuration" type="wpc:RegistrationConfiguration"/>
</xs:sequence>
- <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
@@ -42,17 +42,18 @@
<xs:sequence>
<xs:element name="registration-policy" type="xs:string" minOccurs="0"/>
<xs:element name="registration-property-validator" type="xs:string" minOccurs="0"/>
- <xs:element name="registration-property-description" type="RegistrationPropertyDescription" minOccurs="0"
+ <xs:element name="registration-property-description" type="wpc:RegistrationPropertyDescription" minOccurs="0"
maxOccurs="unbounded"/>
</xs:sequence>
+ <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" use="optional"/>
</xs:complexType>
<xs:complexType name="RegistrationPropertyDescription">
<xs:sequence>
<xs:element name="name" type="xs:QName"/>
<xs:element name="type" type="xs:QName"/>
- <xs:element name="label" type="LocalizedString"/>
- <xs:element name="hint" type="LocalizedString" minOccurs="0"/>
+ <xs:element name="label" type="wpc:LocalizedString"/>
+ <xs:element name="hint" type="wpc:LocalizedString" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-11-26 05:03:15 UTC (rev 9094)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-11-26 05:10:47 UTC (rev 9095)
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
@@ -20,12 +21,13 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
- "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
-
-<producer-configuration>
+<wpc:producer-configuration xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_6 "
+ xmlns:xml="http://www.w3.org/XML/1998/namespace">
<registration-configuration fullServiceDescriptionRequiresRegistration="true">
- <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator>
+ <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator
+ </registration-property-validator>
<registration-property-description>
<name>name1</name>
<type>xsd:string</type>
@@ -34,9 +36,9 @@
</registration-property-description>
<registration-property-description>
<name>name2</name>
- <type>xsd:string</type>
+ <type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:string</type>
<label xml:lang="en" resourceName="resource.label2">label2</label>
<hint xml:lang="en" resourceName="resource.hint2">hint2</hint>
</registration-property-description>
</registration-configuration>
-</producer-configuration>
+</wpc:producer-configuration>
18 years, 7 months
JBoss Portal SVN: r9094 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf: consumers and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-26 00:03:15 -0500 (Mon, 26 Nov 2007)
New Revision: 9094
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml
Log:
- Make tab names consistent.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-26 01:50:21 UTC (rev 9093)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2007-11-26 05:03:15 UTC (rev 9094)
@@ -7,7 +7,7 @@
<h:form>
<ul class="topnav">
- <li id="currentTab">Consumers</li>
+ <li id="currentTab">Consumers Configuration</li>
<li><h:commandLink value="Producer Configuration" action="producer"/></li>
<li>Producer Data</li>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml 2007-11-26 01:50:21 UTC (rev 9093)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.xhtml 2007-11-26 05:03:15 UTC (rev 9094)
@@ -8,7 +8,7 @@
<h:form>
<ul class="topnav">
<li><h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers Configuration"/></li>
- <li id="currentTab">Producer</li>
+ <li id="currentTab">Producer Configuration</li>
<li>Producer Data</li>
</ul>
</h:form>
18 years, 7 months
JBoss Portal SVN: r9093 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-25 20:50:21 -0500 (Sun, 25 Nov 2007)
New Revision: 9093
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java
Log:
- Correctly output lang attribute.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java 2007-11-26 01:47:53 UTC (rev 9092)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java 2007-11-26 01:50:21 UTC (rev 9093)
@@ -25,6 +25,7 @@
import org.jboss.portal.registration.RegistrationPolicy;
import org.jboss.portal.registration.policies.DefaultRegistrationPolicy;
+import org.jboss.portal.wsrp.WSRPUtils;
import org.jboss.portal.wsrp.producer.config.impl.ProducerConfigurationImpl;
import org.jboss.portal.wsrp.producer.config.impl.ProducerRegistrationRequirementsImpl;
import org.jboss.portal.wsrp.registration.LocalizedString;
@@ -136,7 +137,7 @@
Object value = null;
if ("lang".equals(localName))
{
- value = localizedString.getLocale().getCountry();
+ value = WSRPUtils.toString(localizedString.getLocale());
}
else if ("resourceName".equals(localName))
{
@@ -145,8 +146,8 @@
return value;
}
- public Object getElementValue(LocalizedString localizedString, String namespaceUri, String localName)
- {
- return localizedString.getValue();
- }
+ public Object getElementValue(LocalizedString localizedString, String namespaceUri, String localName)
+ {
+ return localizedString.getValue();
+ }
}
18 years, 7 months
JBoss Portal SVN: r9092 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-25 20:47:53 -0500 (Sun, 25 Nov 2007)
New Revision: 9092
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
Log:
- Correctly resolve the QName for the RegistrationPropertyDescription type.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-25 19:10:00 UTC (rev 9091)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-26 01:47:53 UTC (rev 9092)
@@ -156,7 +156,7 @@
else if ("type".equals(localName))
{
value = StringPropertyReplacer.replaceProperties(value);
- QName type = new QName(value);
+ QName type = nav.resolveQName(value);
if (!WSRPConstants.XSD_STRING.equals(type))
{
throw new IllegalArgumentException("'" + value + "' is not a supported type. Currently, only 'xsd:string' is supported.");
18 years, 7 months
JBoss Portal SVN: r9091 - in branches/JBoss_Portal_Branch_2_6/wsrp/src: resources/portal-wsrp-sar/xsd and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-25 14:10:00 -0500 (Sun, 25 Nov 2007)
New Revision: 9091
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
Log:
- Use correct XML Schema types on RegistrationPropertyDescription name and type content model. This solves the CCE problem that had been blocking me... :(
- Properly serialize value of LocalizedStrings. ProducerConfigurationProvider needs testing.
- Need to retrieve proper namespace when checking for RegistrationPropertyDescription type.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-25 15:08:34 UTC (rev 9090)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-11-25 19:10:00 UTC (rev 9091)
@@ -156,7 +156,8 @@
else if ("type".equals(localName))
{
value = StringPropertyReplacer.replaceProperties(value);
- if (!"xsd:string".equals(value))
+ QName type = new QName(value);
+ if (!WSRPConstants.XSD_STRING.equals(type))
{
throw new IllegalArgumentException("'" + value + "' is not a supported type. Currently, only 'xsd:string' is supported.");
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java 2007-11-25 15:08:34 UTC (rev 9090)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationProvider.java 2007-11-25 19:10:00 UTC (rev 9091)
@@ -144,4 +144,9 @@
}
return value;
}
+
+ public Object getElementValue(LocalizedString localizedString, String namespaceUri, String localName)
+ {
+ return localizedString.getValue();
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-11-25 15:08:34 UTC (rev 9090)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-11-25 19:10:00 UTC (rev 9091)
@@ -49,8 +49,8 @@
<xs:complexType name="RegistrationPropertyDescription">
<xs:sequence>
- <xs:element name="name" type="xs:string"/>
- <xs:element name="type" type="xs:string"/>
+ <xs:element name="name" type="xs:QName"/>
+ <xs:element name="type" type="xs:QName"/>
<xs:element name="label" type="LocalizedString"/>
<xs:element name="hint" type="LocalizedString" minOccurs="0"/>
</xs:sequence>
18 years, 7 months
JBoss Portal SVN: r9090 - in branches/presentation/presentation/src/main/org/jboss/portal/presentation: model and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-25 10:08:34 -0500 (Sun, 25 Nov 2007)
New Revision: 9090
Added:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/StateScope.java
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java
Log:
added getProperty on UIObject but with no implementation yet (placeholder)
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-23 16:40:10 UTC (rev 9089)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-25 15:08:34 UTC (rev 9090)
@@ -22,19 +22,14 @@
******************************************************************************/
package org.jboss.portal.presentation.impl.model;
-import java.util.List;
-import java.util.ArrayList;
-import java.io.Serializable;
-
+import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.presentation.model.StateScope;
import org.jboss.portal.presentation.model.UIObject;
-import org.jboss.portal.presentation.model.UIContext;
-import org.jboss.portal.presentation.model.UIPortal;
-import org.jboss.portal.presentation.model.UIContainer;
-import org.jboss.portal.presentation.model.UIWindow;
-import org.jboss.portal.presentation.model.UIPage;
-
import org.jboss.portal.presentation.model.state.ObjectState;
+import java.io.Serializable;
+import java.util.List;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*
@@ -108,6 +103,11 @@
return this.id;
}
+ public String getProperty(StateScope scope, String propertyName)
+ {
+ throw new NotYetImplemented("Just a place holder for now");
+ }
+
public UIObject getChild(String name)
{
for (UIObject child : getChildren())
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/StateScope.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/StateScope.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/StateScope.java 2007-11-25 15:08:34 UTC (rev 9090)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated 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.portal.presentation.model;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public enum StateScope
+{
+ /**
+ * The content scope.
+ */
+ CONTENT,
+
+ /**
+ * The navigational scope.
+ */
+ NAVIGATIONAL,
+
+ /**
+ * The server scope.
+ */
+ SERVER
+}
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java 2007-11-23 16:40:10 UTC (rev 9089)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIObject.java 2007-11-25 15:08:34 UTC (rev 9090)
@@ -50,6 +50,9 @@
UIObject getChild(String name);
+
+ String getProperty(StateScope scope, String propertyName);
+
/**
* Create a child with a specified type.
*
18 years, 7 months
JBoss Portal SVN: r9089 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf: common and 1 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-23 11:40:10 -0500 (Fri, 23 Nov 2007)
New Revision: 9089
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
Log:
small cleanup
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-11-23 16:16:29 UTC (rev 9088)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-11-23 16:40:10 UTC (rev 9089)
@@ -25,10 +25,10 @@
<ui:define name="content">
<h:form>
<h:panelGrid columns="2">
- <h:outputText for="rolename" value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
<h:outputText id="rolename" value="#{editrolemgr.uiRole.name}" />
- <h:outputText for="roledisplayname" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
<h:inputText value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-23 16:16:29 UTC (rev 9088)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-23 16:40:10 UTC (rev 9089)
@@ -8,13 +8,13 @@
<h:form>
<h:panelGrid columns="2">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:outputText id="username" value="#{manager.uiUser.username}"/>
- <h:outputText for="email" value="#{bundle.IDENTITY_EMAIL}"/>
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
<h:outputText id="email" value="#{manager.uiUser.attribute.email}"/>
- <h:outputText for="password" value="#{bundle.IDENTITY_PASSWORD}"/>
+ <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:outputText id="password">******</h:outputText>
</h:panelGrid>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-11-23 16:16:29 UTC (rev 9088)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-11-23 16:40:10 UTC (rev 9089)
@@ -15,7 +15,7 @@
<h:form>
<p><h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_DESCRIPTION}" /></p>
<h:panelGrid columns="2" cellpadding="3">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:inputText id="username" value="#{lostpasswordmgr.username}" required="true"/>
<h:panelGroup />
<h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
18 years, 7 months