gatein SVN: r6287 - in portal/trunk: component and 16 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-19 09:52:46 -0400 (Tue, 19 Apr 2011)
New Revision: 6287
Modified:
portal/trunk/
portal/trunk/component/
portal/trunk/component/test/
portal/trunk/examples/
portal/trunk/examples/extension/
portal/trunk/examples/portal/
portal/trunk/examples/portlets/
portal/trunk/examples/skins/
portal/trunk/gadgets/
portal/trunk/packaging/
portal/trunk/portlet/
portal/trunk/server/
portal/trunk/server/jboss/
portal/trunk/starter/
portal/trunk/testsuite/
portal/trunk/web/
portal/trunk/webui/
portal/trunk/wsrp-integration/
Log:
added "target" directory to svn:ignore of several modules
Property changes on: portal/trunk
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
*.ipr
+ target
*.iml
.idea
*.ipr
Property changes on: portal/trunk/component
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/component/test
___________________________________________________________________
Modified: svn:ignore
- *.iml
+ target
*.iml
Property changes on: portal/trunk/examples
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/examples/extension
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/examples/portal
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/examples/portlets
___________________________________________________________________
Modified: svn:ignore
- *.iml
+ target
*.iml
Property changes on: portal/trunk/examples/skins
___________________________________________________________________
Modified: svn:ignore
- *.iml
+ target
*.iml
Property changes on: portal/trunk/gadgets
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/packaging
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
profiles.xml
+ target
*.iml
.idea
profiles.xml
Property changes on: portal/trunk/portlet
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/server
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/server/jboss
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/starter
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/testsuite
___________________________________________________________________
Modified: svn:ignore
- *.iml
+ target
*.iml
Property changes on: portal/trunk/web
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/webui
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
Property changes on: portal/trunk/wsrp-integration
___________________________________________________________________
Modified: svn:ignore
- *.iml
.idea
+ target
*.iml
.idea
13 years, 8 months
gatein SVN: r6286 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-19 09:47:59 -0400 (Tue, 19 Apr 2011)
New Revision: 6286
Removed:
portal/trunk/packaging/module/
portal/trunk/packaging/pkg/
portal/trunk/packaging/product/
portal/trunk/packaging/reports/
Modified:
portal/trunk/packaging/pom.xml
Log:
finally eradicated exobuild
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2011-04-19 13:39:20 UTC (rev 6285)
+++ portal/trunk/packaging/pom.xml 2011-04-19 13:47:59 UTC (rev 6286)
@@ -37,16 +37,22 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ </profile>
+ <profile>
+ <id>pkg-all</id>
<modules>
- <module>reports</module>
- </modules>
+ <module>dependencies</module>
+ <module>tomcat</module>
+ <module>jetty</module>
+ <module>jboss-as5</module>
+ <module>jboss-as6</module>
+ </modules>
</profile>
<profile>
<id>pkg-tomcat</id>
<modules>
<module>dependencies</module>
<module>tomcat</module>
- <module>reports</module>
</modules>
</profile>
<profile>
@@ -54,7 +60,6 @@
<modules>
<module>dependencies</module>
<module>tomcat</module>
- <module>reports</module>
</modules>
</profile>
<profile>
@@ -62,32 +67,25 @@
<modules>
<module>dependencies</module>
<module>jetty</module>
- <module>reports</module>
</modules>
</profile>
<profile>
<id>pkg-jbossas</id>
<modules>
- <module>module</module>
- <module>product</module>
- <module>pkg</module>
+ <module>jboss-as5</module>
+ <module>jboss-as6</module>
</modules>
</profile>
<profile>
<id>pkg-jbossas6</id>
<modules>
<module>jboss-as6</module>
- <module>reports</module>
</modules>
</profile>
<profile>
<id>pkg-jbossas5</id>
<modules>
- <module>module</module>
- <module>product</module>
- <module>pkg</module>
<module>jboss-as5</module>
- <module>reports</module>
</modules>
</profile>
</profiles>
13 years, 8 months
gatein SVN: r6285 - in components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol: v2 and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-04-19 09:39:20 -0400 (Tue, 19 Apr 2011)
New Revision: 6285
Modified:
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
Log:
GTNWSRP-219: update tests so they will run properly again.
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2011-04-19 13:18:27 UTC (rev 6284)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2011-04-19 13:39:20 UTC (rev 6285)
@@ -241,13 +241,16 @@
public void enableWSS(boolean enable)
{
- // FIXME enableWSS
-
}
public boolean isWSSEnabled()
{
- // FIXME isWSSEnabled
return false;
}
+
+ @Override
+ public boolean isWSSAvailable()
+ {
+ return false;
+ }
}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2011-04-19 13:18:27 UTC (rev 6284)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2011-04-19 13:39:20 UTC (rev 6285)
@@ -237,13 +237,15 @@
public void enableWSS(boolean enable)
{
- // FIXME enableWSS
-
}
public boolean isWSSEnabled()
{
- // FIXME isWSSEnabled
return false;
}
+
+ public boolean isWSSAvailable()
+ {
+ return false;
+ }
}
\ No newline at end of file
13 years, 8 months
gatein SVN: r6283 - maven/packager/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-19 09:18:18 -0400 (Tue, 19 Apr 2011)
New Revision: 6283
Added:
maven/packager/tags/1.0.0-CR04/
Log:
[maven-scm] copy for tag 1.0.0-CR04
13 years, 8 months
gatein SVN: r6281 - maven/packager/trunk/src/main/javascript/eXo/server.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-19 09:17:14 -0400 (Tue, 19 Apr 2011)
New Revision: 6281
Modified:
maven/packager/trunk/src/main/javascript/eXo/server/Tomcat.js
Log:
GTNMAVEN-22 : Update SLF4J to 1.5.8 for Tomcat.js
Modified: maven/packager/trunk/src/main/javascript/eXo/server/Tomcat.js
===================================================================
--- maven/packager/trunk/src/main/javascript/eXo/server/Tomcat.js 2011-04-19 12:15:46 UTC (rev 6280)
+++ maven/packager/trunk/src/main/javascript/eXo/server/Tomcat.js 2011-04-19 13:17:14 UTC (rev 6281)
@@ -68,8 +68,8 @@
var version = product.version;
if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0
&& version.indexOf("2.5") != 0) {
- product.addDependencies(new Project("org.slf4j", "slf4j-api", "jar", "1.5.6"));
- product.addDependencies(new Project("org.slf4j", "slf4j-jdk14", "jar", "1.5.6"));
+ product.addDependencies(new Project("org.slf4j", "slf4j-api", "jar", "1.5.8"));
+ product.addDependencies(new Project("org.slf4j", "slf4j-jdk14", "jar", "1.5.8"));
}
product.addDependencies(new Project("commons-logging", "commons-logging", "jar", "1.0.4"));
product.addDependencies(new Project("commons-pool", "commons-pool", "jar", "1.2"));
13 years, 8 months
gatein SVN: r6280 - epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-19 08:15:46 -0400 (Tue, 19 Apr 2011)
New Revision: 6280
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java
Log:
JBEPP-773 "Preferences" tab is only showing up if portlet has been customized (Only possible though portal.xml)
Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java 2011-04-19 11:44:39 UTC (rev 6279)
+++ epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputSet.java 2011-04-19 12:15:46 UTC (rev 6280)
@@ -167,12 +167,13 @@
UIForm uiForm = getAncestorOfType(UIForm.class);
for (UIComponent inputEntry : getChildren())
{
- if (inputEntry instanceof UIFormInputBase)
+ if (inputEntry.isRendered())
{
- if (inputEntry.isRendered())
+ String label = "";
+ boolean hasLabel = false;
+ if (inputEntry instanceof UIFormInputBase)
{
UIFormInputBase formInputBase = (UIFormInputBase) inputEntry;
- String label;
if (formInputBase.getLabel() != null)
{
label = uiForm.getLabel(res, formInputBase.getLabel());
@@ -181,20 +182,24 @@
{
label = uiForm.getLabel(res, formInputBase.getId());
}
- w.write("<tr>");
- w.write("<td class=\"FieldLabel\">");
-
- // if missing resource and the label hasn't been set before, don't print out the label.
if (formInputBase.getLabel() != null || (label != formInputBase.getId()))
{
- w.write(label);
+ hasLabel = true;
}
- w.write("</td>");
- w.write("<td class=\"FieldComponent\">");
- renderUIComponent(formInputBase);
- w.write("</td>");
- w.write("</tr>");
}
+ w.write("<tr>");
+ w.write("<td class=\"FieldLabel\">");
+
+ // if missing resource and the label hasn't been set before, don't print out the label.
+ if (hasLabel)
+ {
+ w.write(label);
+ }
+ w.write("</td>");
+ w.write("<td class=\"FieldComponent\">");
+ renderUIComponent(inputEntry);
+ w.write("</td>");
+ w.write("</tr>");
}
}
w.write("</table>");
13 years, 8 months
gatein SVN: r6279 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-19 07:44:39 -0400 (Tue, 19 Apr 2011)
New Revision: 6279
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl
Log:
- Removed unneeded variables (should make page loading a tiny bit faster by avoiding unecessary processing).
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl 2011-04-19 11:43:58 UTC (rev 6278)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl 2011-04-19 11:44:39 UTC (rev 6279)
@@ -6,14 +6,6 @@
import org.exoplatform.portal.config.model.PortalProperties ;
def rcontext = _ctx.getRequestContext() ;
- String docBase = rcontext.getRequestContextPath() ;
- String skin = uicomponent.getSkin();
- def portalSkins = uicomponent.getPortalSkins() ;
- def portletSkins = uicomponent.getPortletSkins() ;
- def scriptsPaths = uicomponent.getJavascriptURLs();
- def lang = uicomponent.getLocale().getLanguage();
- def title = rcontext.getTitle();
- def metaInformation = rcontext.getMetaInformation();
%>
<%
13 years, 8 months