gatein SVN: r6799 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-02 07:58:38 -0400 (Sat, 02 Jul 2011)
New Revision: 6799
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
Log:
JBEPP-970 configuration changes
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-02 11:31:04 UTC (rev 6798)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-02 11:58:38 UTC (rev 6799)
@@ -22,20 +22,22 @@
<div class="MiddleRightLoginDecorator">
<div class="LoginDecoratorBackground">
<div class="LoginDetailBox">
- <form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
+ <% uiform.begin(); %>
+ <!--<form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
+ <input type="hidden" name="<%= uiform.ACTION %>" value=""/>-->
<input type="hidden" name="initialURI" value="<%=requestPath %>"/>
<div class="VerticalLayout">
<table class="UIFormGrid">
<tr class="UserNameField">
<td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.UserName")%></td>
- <td><input class="UserName" name="username"/></td>
+ <td><% uiform.renderChild(0)%></td>
</tr>
<tr class="PasswordField" id="UIPortalLoginFormControl" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)">
<td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.password")%></td>
- <td><input class="Password" type="password" name="password"/></td>
+ <td><% uiform.renderChild(1)%></td>
</tr>
<tr class="RememberField" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)">
- <td class="FieldLabel"><input type="checkbox" class="checkbox" value="true" name="rememberme"/></td>
+ <td class="FieldLabel"><% uiform.renderChild(2)%></td>
<td><%=_ctx.appRes("UILoginForm.label.RememberOnComputer")%></td>
</tr>
</table>
@@ -67,7 +69,7 @@
</table>
</div>
</div>
- </form>
+ <%uiform.end()%>
</div>
</div>
</div>
@@ -82,6 +84,7 @@
<script>
function login(ele) {
var formEle = eXo.core.DOMUtil.findAncestorByTagName(ele,'form');
+ formEle.action = eXo.env.portal.context + "/login";
formEle.submit();
}
</script>
13 years, 5 months
gatein SVN: r6798 - in epp/portal/branches/EPP_5_2_Branch: distribution/jboss-epp and 2 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-02 07:31:04 -0400 (Sat, 02 Jul 2011)
New Revision: 6798
Modified:
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
Log:
JBEPP-970 configuration changes
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-01 20:15:36 UTC (rev 6797)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-02 11:31:04 UTC (rev 6798)
@@ -357,6 +357,10 @@
pr.setAccessPermissions(src.getAccessPermissions());
pr.setEditPermission(src.getEditPermission());
+ Described described = dst.adapt(Described.class);
+ described.setName(src.getLabel());
+ described.setDescription(src.getDescription());
+
//
org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates");
org.gatein.mop.api.workspace.Page template = templates.getChild("default");
@@ -584,6 +588,11 @@
pr.setEditPermission(src.getEditPermission());
//
+ Described described = dst.adapt(Described.class);
+ described.setName(src.getTitle());
+ described.setDescription(src.getDescription());
+
+ //
Attributes attrs = dst.getAttributes();
attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId());
attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow());
@@ -629,6 +638,10 @@
ProtectedResource pr = dst.adapt(ProtectedResource.class);
pr.setAccessPermissions(src.getAccessPermissions());
+ Described described = dst.adapt(Described.class);
+ described.setName(src.getTitle());
+ described.setDescription(src.getDescription());
+
Attributes dstAttrs = dst.getAttributes();
dstAttrs.setValue(MappedAttributes.ID, src.getId());
dstAttrs.setValue(MappedAttributes.TYPE, src instanceof DashboardData ? "dashboard" : null);
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-01 20:15:36 UTC (rev 6797)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-07-02 11:31:04 UTC (rev 6798)
@@ -160,7 +160,7 @@
<executions>
<execution>
<id>distro-assembly-zip</id>
- <phase>compile</phase>
+ <phase>packaging</phase>
<goals>
<goal>single</goal>
</goals>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-01 20:15:36 UTC (rev 6797)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-07-02 11:31:04 UTC (rev 6798)
@@ -22,22 +22,20 @@
<div class="MiddleRightLoginDecorator">
<div class="LoginDecoratorBackground">
<div class="LoginDetailBox">
- <% uiform.begin(); %>
- <!--<form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
- <input type="hidden" name="<%= uiform.ACTION %>" value=""/>-->
+ <form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
<input type="hidden" name="initialURI" value="<%=requestPath %>"/>
<div class="VerticalLayout">
<table class="UIFormGrid">
<tr class="UserNameField">
<td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.UserName")%></td>
- <td><% uiform.renderChild(0)%></td>
+ <td><input class="UserName" name="username"/></td>
</tr>
<tr class="PasswordField" id="UIPortalLoginFormControl" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)">
<td class="FieldLabel"><%=_ctx.appRes("UILoginForm.label.password")%></td>
- <td><% uiform.renderChild(1)%></td>
+ <td><input class="Password" type="password" name="password"/></td>
</tr>
<tr class="RememberField" onkeypress="eXo.portal.UIPortalControl.onEnterPress(event)">
- <td class="FieldLabel"><% uiform.renderChild(2)%></td>
+ <td class="FieldLabel"><input type="checkbox" class="checkbox" value="true" name="rememberme"/></td>
<td><%=_ctx.appRes("UILoginForm.label.RememberOnComputer")%></td>
</tr>
</table>
@@ -69,7 +67,7 @@
</table>
</div>
</div>
- <%uiform.end()%>
+ </form>
</div>
</div>
</div>
@@ -84,7 +82,6 @@
<script>
function login(ele) {
var formEle = eXo.core.DOMUtil.findAncestorByTagName(ele,'form');
- formEle.action = eXo.env.portal.context + "/login";
formEle.submit();
}
</script>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 20:15:36 UTC (rev 6797)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-02 11:31:04 UTC (rev 6798)
@@ -7,7 +7,10 @@
import java.util.Iterator;
import org.exoplatform.portal.webui.portal.UIPortal ;
import org.exoplatform.portal.config.model.PortalProperties ;
-
+ import org.gatein.common.text.EntityEncoder;
+
+ EntityEncoder encoder = EntityEncoder.FULL;
+
def rcontext = _ctx.getRequestContext() ;
String docBase = rcontext.getRequestContextPath() ;
String skin = uicomponent.getSkin();
@@ -15,7 +18,7 @@
def portletSkins = uicomponent.getPortletSkins() ;
def scriptsPaths = uicomponent.getJavascriptURLs();
def lang = uicomponent.getLocale().getLanguage();
- def title = rcontext.getTitle();
+ def title = encoder.encode(rcontext.getTitle());
def metaInformation = rcontext.getMetaInformation();
%>
13 years, 5 months
gatein SVN: r6797 - epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-01 16:15:36 -0400 (Fri, 01 Jul 2011)
New Revision: 6797
Modified:
epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml
Log:
Zip distribution on the end
Modified: epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-07-01 19:28:40 UTC (rev 6796)
+++ epp/portal/branches/EPP_5_1_Branch/distribution/jboss-eap/pom.xml 2011-07-01 20:15:36 UTC (rev 6797)
@@ -131,7 +131,7 @@
<executions>
<execution>
<id>distro-assembly-zip</id>
- <phase>compile</phase>
+ <phase>packaging</phase>
<goals>
<goal>single</goal>
</goals>
13 years, 6 months
gatein SVN: r6796 - portal/trunk/component/portal/src/test/java/org/exoplatform/portal.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-07-01 15:28:40 -0400 (Fri, 01 Jul 2011)
New Revision: 6796
Modified:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
Log:
Theme accidently removed. Was added per jira GTNPORTAL-1818.
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-07-01 19:26:48 UTC (rev 6795)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/TestXSDCorruption.java 2011-07-01 19:28:40 UTC (rev 6796)
@@ -60,6 +60,6 @@
{
assertHash("d0591b0a022a0c2929e1aed8979857cd", "gatein_objects_1_0.xsd");
assertHash("99ae24c9bbfe1b59e066756a29ab6c79", "gatein_objects_1_1.xsd");
- assertHash("8bb0cd234fc32e11149e38f689dd7cef", "gatein_objects_1_2.xsd");
+ assertHash("e30953182120381d5ffe65056071a270", "gatein_objects_1_2.xsd");
}
}
13 years, 6 months
gatein SVN: r6795 - portal/trunk/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-07-01 15:26:48 -0400 (Fri, 01 Jul 2011)
New Revision: 6795
Modified:
portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd
Log:
Theme accidently removed. Was added per jira GTNPORTAL-1818.
Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-07-01 19:24:03 UTC (rev 6794)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_2.xsd 2011-07-01 19:26:48 UTC (rev 6795)
@@ -175,10 +175,11 @@
<xs:complexType name="portletApplicationType">
<xs:sequence>
- <xs:choice>
- <xs:element name="portlet" type="portletType"/>
- <xs:element name="wsrp" type="xs:string"/>
- </xs:choice>
+ <xs:choice>
+ <xs:element name="portlet" type="portletType"/>
+ <xs:element name="wsrp" type="xs:string"/>
+ </xs:choice>
+ <xs:element name="theme" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
13 years, 6 months
gatein SVN: r6794 - in epp/portal/branches/EPP_5_2_Branch: distribution/jboss-epp/serverAddon/gatein.ear and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-07-01 15:24:03 -0400 (Fri, 01 Jul 2011)
New Revision: 6794
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
Log:
JBEPP-970 configuration changes
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-01 16:01:54 UTC (rev 6793)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-01 19:24:03 UTC (rev 6794)
@@ -877,20 +877,16 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-exo</artifactId>
</dependency>
-<!-- <dependency>
+ <dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<exclusions>
<exclusion>
- <artifactId>annotations-api</artifactId>
- <groupId>org.apache.tomcat</groupId>
+ <artifactId>wci-tomcat</artifactId>
+ <groupId>org.gatein.wci</groupId>
</exclusion>
- <exclusion>
- <artifactId>catalina</artifactId>
- <groupId>org.apache.tomcat</groupId>
- </exclusion>
</exclusions>
- </dependency>-->
+ </dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-bridge</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-01 16:01:54 UTC (rev 6793)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-07-01 19:24:03 UTC (rev 6794)
@@ -45,7 +45,7 @@
<org.shindig.version>1.0-r790473-Patch06</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-Beta03</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 16:01:54 UTC (rev 6793)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl 2011-07-01 19:24:03 UTC (rev 6794)
@@ -7,10 +7,7 @@
import java.util.Iterator;
import org.exoplatform.portal.webui.portal.UIPortal ;
import org.exoplatform.portal.config.model.PortalProperties ;
- import org.gatein.common.text.EntityEncoder;
- EntityEncoder encoder = EntityEncoder.FULL;
-
def rcontext = _ctx.getRequestContext() ;
String docBase = rcontext.getRequestContextPath() ;
String skin = uicomponent.getSkin();
@@ -18,7 +15,7 @@
def portletSkins = uicomponent.getPortletSkins() ;
def scriptsPaths = uicomponent.getJavascriptURLs();
def lang = uicomponent.getLocale().getLanguage();
- def title = encoder.encode(rcontext.getTitle());
+ def title = rcontext.getTitle();
def metaInformation = rcontext.getMetaInformation();
%>
13 years, 6 months
gatein SVN: r6793 - in sandbox/as7_support: trunk and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-07-01 12:01:54 -0400 (Fri, 01 Jul 2011)
New Revision: 6793
Added:
sandbox/as7_support/trunk/README.txt
Removed:
sandbox/as7_support/README.txt
Log:
Move README.txt to new trunk
Deleted: sandbox/as7_support/README.txt
===================================================================
--- sandbox/as7_support/README.txt 2011-07-01 15:58:20 UTC (rev 6792)
+++ sandbox/as7_support/README.txt 2011-07-01 16:01:54 UTC (rev 6793)
@@ -1,37 +0,0 @@
-This branch is for the development of JBoss AS7 support
-
-To deploy SimplePortal to JBoss AS7 follow these steps:
-
-
-svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support
-
-cd as7_support
-
-cd wci
-mvn install -Dmaven.test.skip
-
-(Make sure you're using maven 2.2.1 as wci and pc don't work with maven 3 yet due to JBoss Unit AFAICT)
-
-cd ..
-cd pc
-mvn install -P\!default,portal -Dmaven.test.skip
-
-(on Windows remove the backslash: -P!default,portal)
-
-cd jboss-as7-integration
-mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR
-
-(the previous command automatically downloads jboss-7.0.0.CR1 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile)
-
-cp pkg
-cd target
-cd jboss-7.0.0.CR1
-cd bin
-./standalone.sh (or just 'standalone' on Windows)
-
-You should see exactly one stacktrace deliberately thrown by FailDuringInitPortlet.
-
-Goto: http://localhost:8080/simple-portal
-
-Click around, and see how everything that should be working is working, and how what shouldn't be working isn't working :)
-
Copied: sandbox/as7_support/trunk/README.txt (from rev 6792, sandbox/as7_support/README.txt)
===================================================================
--- sandbox/as7_support/trunk/README.txt (rev 0)
+++ sandbox/as7_support/trunk/README.txt 2011-07-01 16:01:54 UTC (rev 6793)
@@ -0,0 +1,37 @@
+This branch is for the development of JBoss AS7 support
+
+To deploy SimplePortal to JBoss AS7 follow these steps:
+
+
+svn co http://anonsvn.jboss.org/repos/gatein/sandbox/as7_support
+
+cd as7_support
+
+cd wci
+mvn install -Dmaven.test.skip
+
+(Make sure you're using maven 2.2.1 as wci and pc don't work with maven 3 yet due to JBoss Unit AFAICT)
+
+cd ..
+cd pc
+mvn install -P\!default,portal -Dmaven.test.skip
+
+(on Windows remove the backslash: -P!default,portal)
+
+cd jboss-as7-integration
+mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR
+
+(the previous command automatically downloads jboss-7.0.0.CR1 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile)
+
+cp pkg
+cd target
+cd jboss-7.0.0.CR1
+cd bin
+./standalone.sh (or just 'standalone' on Windows)
+
+You should see exactly one stacktrace deliberately thrown by FailDuringInitPortlet.
+
+Goto: http://localhost:8080/simple-portal
+
+Click around, and see how everything that should be working is working, and how what shouldn't be working isn't working :)
+
13 years, 6 months
gatein SVN: r6790 - sandbox/as7_support.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-07-01 11:43:15 -0400 (Fri, 01 Jul 2011)
New Revision: 6790
Added:
sandbox/as7_support/tags/
sandbox/as7_support/trunk/
Log:
Adjust directory layout to support tagging
13 years, 6 months