March 2011 - gatein-commits - Jboss List Archives

gatein SVN: r5978 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.

by do-not-reply＠jboss.org

Author: mputz Date: 2011-03-08 08:36:52 -0500 (Tue, 08 Mar 2011) New Revision: 5978 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java Log: GTNPORTAL-1828: Translation of navigation elements not working for languages defined with country variant Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2011-03-08 10:02:01 UTC (rev 5977) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2011-03-08 13:36:52 UTC (rev 5978) @@ -413,8 +413,9 @@ { if (nav.getOwnerType().equals(PortalConfig.USER_TYPE)) return; + String localeLanguage = (locale.getCountry().length() > 0) ? locale.getLanguage() + "_" + locale.getCountry() : locale.getLanguage(); ResourceBundle res = - i18nManager.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId()); + i18nManager.getNavigationResourceBundle(localeLanguage, nav.getOwnerType(), nav.getOwnerId()); for (PageNode node : nav.getNodes()) { resolveLabel(res, node); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-03-08 10:02:01 UTC (rev 5977) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-03-08 13:36:52 UTC (rev 5978) @@ -183,8 +183,9 @@ private void localizeNavigation(Locale locale) { + String localeLanguage = (locale.getCountry().length() > 0) ? locale.getLanguage() + "_" + locale.getCountry() : locale.getLanguage(); LocaleConfig localeConfig = - getApplicationComponent(LocaleConfigService.class).getLocaleConfig(locale.getLanguage()); + getApplicationComponent(LocaleConfigService.class).getLocaleConfig(localeLanguage); String ownerType = edittedNavigation.getOwnerType(); if (!PortalConfig.USER_TYPE.equals(ownerType)) { Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-03-08 10:02:01 UTC (rev 5977) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2011-03-08 13:36:52 UTC (rev 5978) @@ -383,7 +383,8 @@ ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class); if (nav.getOwnerType().equals(PortalConfig.USER_TYPE)) return; - ResourceBundle res = mgr.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId()); + String localeLanguage = (locale.getCountry().length() > 0) ? locale.getLanguage() + "_" + locale.getCountry() : locale.getLanguage(); + ResourceBundle res = mgr.getNavigationResourceBundle(localeLanguage, nav.getOwnerType(), nav.getOwnerId()); for (PageNode node : nav.getNodes()) { resolveLabel(res, node);

13 years, 6 months

1
0
0 / 0

gatein SVN: r5977 - in portal/trunk/packaging/tomcat/pkg: tc7 and 1 other directory.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-03-08 05:02:01 -0500 (Tue, 08 Mar 2011) New Revision: 5977 Added: portal/trunk/packaging/tomcat/pkg/tc6/download-tomcat.xml portal/trunk/packaging/tomcat/pkg/tc6/extract-download-urls.xsl portal/trunk/packaging/tomcat/pkg/tc6/package.xml portal/trunk/packaging/tomcat/pkg/tc7/download-tomcat.xml portal/trunk/packaging/tomcat/pkg/tc7/extract-download-urls.xsl portal/trunk/packaging/tomcat/pkg/tc7/package.xml Modified: portal/trunk/packaging/tomcat/pkg/tc6/pom.xml portal/trunk/packaging/tomcat/pkg/tc7/pom.xml Log: Added -Pdownload support to Tomcat builds Added: portal/trunk/packaging/tomcat/pkg/tc6/download-tomcat.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/download-tomcat.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc6/download-tomcat.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="download-tomcat" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> + + <target name="download-tomcat"> + +  + <get dest="${dest}" skipexisting="true"> + <url url="${url}"/> + </get> + +  + <get dest="${dest}.md5" skipexisting="true"> + <url url="${md5.url}"/> + </get> + +  + <replaceregexp file="${dest}.md5" + match="\s(.*)$" + replace="" + byline="true"/> + +  + <local name="checksum.matches"/> + <local name="checksum.matches.fail"/> + <checksum file="${dest}" algorithm="md5" fileext=".md5" + verifyproperty="checksum.matches"/> + <condition property="checksum.matches.fail"> + <equals arg1="${checksum.matches}" arg2="false"/> + </condition> + <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail> + + </target> +</project> \ No newline at end of file Added: portal/trunk/packaging/tomcat/pkg/tc6/extract-download-urls.xsl =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/extract-download-urls.xsl (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc6/extract-download-urls.xsl 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<xsl:stylesheet + version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + exclude-result-prefixes="str"> + + <xsl:output method="xml" indent="yes"/> + <xsl:template match="/"> + <xsl:comment>Generated file</xsl:comment> + <tomcat.download> + <xsl:for-each select="(//a[./text() = 'zip'])[1]"> + <xsl:element name="url"> + <xsl:value-of select="@href"/> + </xsl:element> + <xsl:element name="dir.name"> + <xsl:value-of select="@href"/> + </xsl:element> + </xsl:for-each> + <xsl:for-each select="(//a[./text() = 'md5'])[1]"> + <xsl:element name="url.md5"> + <xsl:value-of select="@href"/> + </xsl:element> + </xsl:for-each> + </tomcat.download> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file Copied: portal/trunk/packaging/tomcat/pkg/tc6/package.xml (from rev 5945, portal/trunk/packaging/jboss-as5/pkg/package.xml) =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/package.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc6/package.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="package" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> + + <target name="package"> + + <echo>Using Tomcat at: ${tomcat.dir}</echo> + +  + <copy todir="${maven.project.build.directory}/tomcat6"> + <fileset dir="${tomcat.dir}"> + <exclude name="webapps/ROOT/**"/> + <exclude name="webapps/examples/**"/> + <exclude name="webapps/docs/**"/> + </fileset> + </copy> + +  + <copy todir="${maven.project.build.directory}/tomcat6"> + <fileset dir="${maven.project.build.directory}/../../target/tomcat"/> + </copy> + +  + <copy todir="${maven.project.build.directory}/tomcat6" overwrite="true"> + <fileset dir="${maven.project.basedir}/src/main/resources/tomcat"/> + </copy> + +  + <copy + file="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" + todir="${maven.project.build.directory}/tomcat6/lib"/> + +  + <copy + file="${maven.project.basedir}/src/main/resources/conf/integration/web.xml" + todir="${maven.project.build.directory}/tomcat6/webapps/integration/WEB-INF"/> + +  +  +  + <chmod perm="0755" type="file" dir="${maven.project.build.directory}/tomcat6" includes="**/*.sh"/> + + </target> +</project> \ No newline at end of file Modified: portal/trunk/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) +++ portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -15,7 +15,9 @@ <name>GateIn for Tomcat 6 packaging</name> <properties> - <tomcat.dir>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}</tomcat.dir> + <tomcat.dir>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}</tomcat.dir> + <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <tomcat.path>${servers.dir}</tomcat.path> </properties> <dependencies> @@ -56,8 +58,20 @@ </execution> </executions> </plugin> - <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> @@ -70,39 +84,11 @@ </goals> <configuration> <target> -  - <copy todir="${project.build.directory}/tomcat6"> - <fileset dir="${tomcat.dir}"> - <exclude name="webapps/ROOT/**"/> - <exclude name="webapps/examples/**"/> - <exclude name="webapps/docs/**"/> - </fileset> - </copy> - -  - <copy todir="${project.build.directory}/tomcat6"> - <fileset dir="${project.build.directory}/../../target/tomcat"/> - </copy> - -  - <copy todir="${project.build.directory}/tomcat6" overwrite="true"> - <fileset dir="${project.basedir}/src/main/resources/tomcat"/> - </copy> - -  - <copy - file="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" - todir="${project.build.directory}/tomcat6/lib"/> - -  - <copy - file="${project.basedir}/src/main/resources/conf/integration/web.xml" - todir="${project.build.directory}/tomcat6/webapps/integration/WEB-INF"/> - -  - <chmod perm="0644" type="file" dir="${project.build.directory}/tomcat6" excludes="**/*.sh"/> - <chmod perm="0755" type="file" dir="${project.build.directory}/tomcat6" includes="**/*.sh"/> - + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> </target> </configuration> </execution> @@ -113,6 +99,109 @@ <profiles> <profile> + <id>download</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>prepare-package</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> +  + <mkdir dir="${tomcat.path}"/> + +  + <get dest="${project.build.directory}/mirror.xml" skipexisting="true"> + <url url="http://tomcat.apache.org/download-60.cgi"/> + </get> + + <replaceregexp file="${project.build.directory}/mirror.xml" + match="<!DOCTYPE(.*)>" + replace="" + byline="true"/> + + <xslt + basedir="${project.build.directory}" + destdir="${project.build.directory}" + includes="mirror.xml" + extension=".xml" + style="${project.basedir}/extract-download-urls.xsl"> + + <mapper type="glob" from="mirror.xml" to="download-urls.xml"/> + </xslt> + + <replaceregexp file="${project.build.directory}/download-urls.xml" + match="<dir.name>(.*)/apache-tomcat-(.*).zip</dir.name>" + replace="<dir.name>apache-tomcat-\2</dir.name>" + byline="true"/> + + <xmlproperty file="${project.build.directory}/download-urls.xml"/> + + <basename file="${tomcat.download.url}" property="tomcat.file.name"/> + <property name="tomcat.zip" + value="${tomcat.path}/${tomcat.file.name}"/> + <property name="tomcat.dir.effective" + value="${tomcat.path}/${tomcat.download.dir.name}"/> + + <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}"/> + +  + + <fail if="tomcat.dir.exists"> +" +Destination Tomcat directory exists already: + ${tomcat.dir.effective} + +Either rename it, delete it, or deactivate -Pdownload profile. +" + </fail> + +  + <ant antfile="${project.basedir}/download-tomcat.xml"> + <target name="download-tomcat"/> + <property name="url" value="${tomcat.download.url}"/> + <property name="md5.url" value="${tomcat.download.url.md5}"/> + <property name="dest" value="${tomcat.zip}"/> + </ant> + +  + <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false"/> + + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="tomcat.dir" value="${tomcat.dir.effective}"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> + + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>bundle</id> <build> <plugins> @@ -129,7 +218,8 @@ </goals> <configuration> <target> - <zip destfile="${project.build.directory}/tomcat6.zip" basedir="${project.build.directory}/tomcat6"/> + <zip destfile="${project.build.directory}/tomcat6.zip" + basedir="${project.build.directory}/tomcat6"/> <attachartifact file="${project.build.directory}/tomcat6.zip" classifier="bundle" type="zip"/> </target> </configuration> @@ -140,5 +230,5 @@ </build> </profile> </profiles> - + </project> \ No newline at end of file Added: portal/trunk/packaging/tomcat/pkg/tc7/download-tomcat.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc7/download-tomcat.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc7/download-tomcat.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="download-tomcat" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> + + <target name="download-tomcat"> + +  + <get dest="${dest}" skipexisting="true"> + <url url="${url}"/> + </get> + +  + <get dest="${dest}.md5" skipexisting="true"> + <url url="${md5.url}"/> + </get> + +  + <replaceregexp file="${dest}.md5" + match="\s(.*)$" + replace="" + byline="true"/> + +  + <local name="checksum.matches"/> + <local name="checksum.matches.fail"/> + <checksum file="${dest}" algorithm="md5" fileext=".md5" + verifyproperty="checksum.matches"/> + <condition property="checksum.matches.fail"> + <equals arg1="${checksum.matches}" arg2="false"/> + </condition> + <fail if="checksum.matches.fail">Checksum validation failed! (for: ${dest})</fail> + + </target> +</project> \ No newline at end of file Added: portal/trunk/packaging/tomcat/pkg/tc7/extract-download-urls.xsl =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc7/extract-download-urls.xsl (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc7/extract-download-urls.xsl 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<xsl:stylesheet + version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + exclude-result-prefixes="str"> + + <xsl:output method="xml" indent="yes"/> + <xsl:template match="/"> + <xsl:comment>Generated file</xsl:comment> + <tomcat.download> + <xsl:for-each select="(//a[./text() = 'zip'])[1]"> + <xsl:element name="url"> + <xsl:value-of select="@href"/> + </xsl:element> + <xsl:element name="dir.name"> + <xsl:value-of select="@href"/> + </xsl:element> + </xsl:for-each> + <xsl:for-each select="(//a[./text() = 'md5'])[1]"> + <xsl:element name="url.md5"> + <xsl:value-of select="@href"/> + </xsl:element> + </xsl:for-each> + </tomcat.download> + </xsl:template> +</xsl:stylesheet> \ No newline at end of file Added: portal/trunk/packaging/tomcat/pkg/tc7/package.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc7/package.xml (rev 0) +++ portal/trunk/packaging/tomcat/pkg/tc7/package.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="package" xmlns:mvn="http://maven.apache.org/POM/4.0.0"> + + <target name="package"> + + <echo>Using Tomcat at: ${tomcat.dir}</echo> + +  + <copy todir="${maven.project.build.directory}/tomcat7"> + <fileset dir="${tomcat.dir}"> + <exclude name="webapps/ROOT/**"/> + <exclude name="webapps/examples/**"/> + <exclude name="webapps/docs/**"/> + </fileset> + </copy> + +  + <copy todir="${maven.project.build.directory}/tomcat7"> + <fileset dir="${maven.project.build.directory}/../../target/tomcat"/> + </copy> + +  + <copy todir="${maven.project.build.directory}/tomcat7" overwrite="true"> + <fileset dir="${maven.project.basedir}/src/main/resources/tomcat"/> + </copy> + +  + <copy + file="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" + todir="${maven.project.build.directory}/tomcat7/lib"/> + +  + <copy + file="${maven.project.basedir}/src/main/resources/conf/integration/web.xml" + tofile="${maven.project.build.directory}/tomcat7/webapps/integration/WEB-INF/web.xml"/> + +  +  +  + <chmod perm="0755" type="file" dir="${maven.project.build.directory}/tomcat7" includes="**/*.sh"/> + + </target> +</project> \ No newline at end of file Modified: portal/trunk/packaging/tomcat/pkg/tc7/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc7/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) +++ portal/trunk/packaging/tomcat/pkg/tc7/pom.xml 2011-03-08 10:02:01 UTC (rev 5977) @@ -15,7 +15,9 @@ <name>GateIn for Tomcat 7 packaging</name> <properties> - <tomcat.dir>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}</tomcat.dir> + <tomcat.dir>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat7.version}</tomcat.dir> + <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <tomcat.path>${servers.dir}</tomcat.path> </properties> <dependencies> @@ -56,8 +58,20 @@ </execution> </executions> </plugin> - <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> @@ -70,40 +84,11 @@ </goals> <configuration> <target> - -  - <copy todir="${project.build.directory}/tomcat7"> - <fileset dir="${tomcat.dir}"> - <exclude name="webapps/ROOT/**"/> - <exclude name="webapps/examples/**"/> - <exclude name="webapps/docs/**"/> - </fileset> - </copy> - -  - <copy todir="${project.build.directory}/tomcat7"> - <fileset dir="${project.build.directory}/../../target/tomcat"/> - </copy> - -  - <copy todir="${project.build.directory}/tomcat7" overwrite="true"> - <fileset dir="${project.basedir}/src/main/resources/tomcat"/> - </copy> - -  - <copy - file="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" - todir="${project.build.directory}/tomcat7/lib"/> - -  - <copy - file="${project.basedir}/src/main/resources/conf/integration/web.xml" - tofile="${project.build.directory}/tomcat7/webapps/integration/WEB-INF/web.xml"/> - -  - <chmod perm="0644" type="file" dir="${project.build.directory}/tomcat7" excludes="**/*.sh"/> - <chmod perm="0755" type="file" dir="${project.build.directory}/tomcat7" includes="**/*.sh"/> - + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> </target> </configuration> </execution> @@ -114,6 +99,109 @@ <profiles> <profile> + <id>download</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>tomcat-check-environment-ready</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>prepare-package</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> +  + <mkdir dir="${tomcat.path}"/> + +  + <get dest="${project.build.directory}/mirror.xml" skipexisting="true"> + <url url="http://tomcat.apache.org/download-70.cgi"/> + </get> + + <replaceregexp file="${project.build.directory}/mirror.xml" + match="<!DOCTYPE(.*)>" + replace="" + byline="true"/> + + <xslt + basedir="${project.build.directory}" + destdir="${project.build.directory}" + includes="mirror.xml" + extension=".xml" + style="${project.basedir}/extract-download-urls.xsl"> + + <mapper type="glob" from="mirror.xml" to="download-urls.xml"/> + </xslt> + + <replaceregexp file="${project.build.directory}/download-urls.xml" + match="<dir.name>(.*)/apache-tomcat-(.*).zip</dir.name>" + replace="<dir.name>apache-tomcat-\2</dir.name>" + byline="true"/> + + <xmlproperty file="${project.build.directory}/download-urls.xml"/> + + <basename file="${tomcat.download.url}" property="tomcat.file.name"/> + <property name="tomcat.zip" + value="${tomcat.path}/${tomcat.file.name}"/> + <property name="tomcat.dir.effective" + value="${tomcat.path}/${tomcat.download.dir.name}"/> + + <available property="tomcat.dir.exists" type="dir" file="${tomcat.dir.effective}"/> + +  + + <fail if="tomcat.dir.exists"> +" +Destination Tomcat directory exists already: + ${tomcat.dir.effective} + +Either rename it, delete it, or deactivate -Pdownload profile. +" + </fail> + +  + <ant antfile="${project.basedir}/download-tomcat.xml"> + <target name="download-tomcat"/> + <property name="url" value="${tomcat.download.url}"/> + <property name="md5.url" value="${tomcat.download.url.md5}"/> + <property name="dest" value="${tomcat.zip}"/> + </ant> + +  + <unzip src="${tomcat.zip}" dest="${tomcat.path}" overwrite="false"/> + + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="tomcat.dir" value="${tomcat.dir.effective}"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> + + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>bundle</id> <build> <plugins>

13 years, 6 months

1
0
0 / 0

gatein SVN: r5976 - in portal/branches/branch-GTNPORTAL-1822: component/web/resources and 9 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-03-08 03:19:36 -0500 (Tue, 08 Mar 2011) New Revision: 5976 Removed: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/pom.xml portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml Log: GTNPORTAL-198: Revert the commit of ClosureCompiler Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -49,10 +49,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - </dependency> - <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> <scope>test</scope> Deleted: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java 2011-03-08 08:19:36 UTC (rev 5976) @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2011 eXo Platform SAS. - * - * 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.exoplatform.portal.resource.compressor.impl; - -import com.google.javascript.jscomp.CheckLevel; -import com.google.javascript.jscomp.CompilationLevel; -import com.google.javascript.jscomp.Compiler; -import com.google.javascript.jscomp.CompilerOptions; -import com.google.javascript.jscomp.JSSourceFile; -import com.google.javascript.jscomp.WarningLevel; -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.portal.resource.compressor.BaseResourceCompressorPlugin; -import org.exoplatform.portal.resource.compressor.ResourceCompressorException; -import org.exoplatform.portal.resource.compressor.ResourceType; -import java.io.Reader; -import java.io.Writer; - -public class ClosureCompressorPlugin extends BaseResourceCompressorPlugin -{ - - public ClosureCompressorPlugin(InitParams params) throws Exception - { - super(params); - } - - public ResourceType getResourceType() - { - return ResourceType.JAVASCRIPT; - } - - public void compress(Reader input, Writer output) throws ResourceCompressorException - { - Compiler compiler = new Compiler(); - CompilerOptions options = new CompilerOptions(); - CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options); - WarningLevel.QUIET.setOptionsForWarningLevel(options); - JSSourceFile extern = JSSourceFile.fromCode("extern", ""); - - JSSourceFile jsInput; - try - { - String code = JSSourceFile.fromReader("code", input).getCode(); - jsInput = JSSourceFile.fromCode("jsInput", code); - compiler.compile(extern, jsInput, options); - output.write(compiler.toSource()); - } - catch (Exception ex) - { - throw new ResourceCompressorException(ex); - } - } -} Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-03-08 08:19:36 UTC (rev 5976) @@ -18,32 +18,19 @@ */ package org.exoplatform.portal.resource.compressor; -import com.google.javascript.jscomp.*; -import com.google.javascript.jscomp.Compiler; -import org.apache.commons.io.IOUtils; -import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.component.test.AbstractKernelTest; import org.exoplatform.component.test.ConfigurationUnit; import org.exoplatform.component.test.ConfiguredBy; import org.exoplatform.component.test.ContainerScope; -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.container.xml.Parameter; -import org.exoplatform.container.xml.ValueParam; -import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.InputStreamReader; import java.io.Reader; import java.io.Writer; -import java.util.Scanner; /** * @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a> @@ -98,66 +85,6 @@ + jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")"); } - public void testClosureCompressing() throws Exception - { - File jsFile = new File("src/test/resources/javascript.js"); - File jsCompressedFile = new File("target/closure-compressed-file.js"); - Reader reader = new FileReader(jsFile); - Writer writer = new FileWriter(jsCompressedFile); - - ResourceCompressorService compressor = - (ResourceCompressorService)getContainer().getComponentInstanceOfType(ResourceCompressor.class); - - InitParams priorityParam = new InitParams(); - ValueParam param = new ValueParam(); - param.setName("plugin.priority"); - param.setValue("10"); - priorityParam.addParameter(param); - compressor.registerCompressorPlugin(new ClosureCompressorPlugin(priorityParam)); - try - { - compressor.compress(reader, writer, ResourceType.JAVASCRIPT); - } - catch (Exception e) - { - fail(e.getLocalizedMessage()); - } - finally - { - reader.close(); - writer.close(); - } - - assertTrue(jsCompressedFile.length() > 0); - assertTrue(jsFile.length() > jsCompressedFile.length()); - log.info("The original javascript (" + getFileSize(jsFile) + ") is compressed by CLOSURE COMPILER into " - + jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")"); - - String expectedJS = closureCompress(jsFile); - assertEquals(expectedJS.length(), jsCompressedFile.length()); - } - - private String closureCompress(File input) throws Exception - { - Compiler compiler = new Compiler(); - CompilerOptions options = new CompilerOptions(); - CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options); - JSSourceFile extern = JSSourceFile.fromCode("", ""); - - JSSourceFile jsInput; - try - { - jsInput = JSSourceFile.fromFile(input); - } - catch (Exception ex) - { - throw new ResourceCompressorException(ex); - } - - compiler.compile(extern, jsInput, options); - return compiler.toSource(); - } - public void testYUICSSCompressing() throws IOException { File cssFile = new File("src/test/resources/Stylesheet.css"); Modified: portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -86,8 +86,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -599,14 +599,10 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -590,14 +590,10 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -598,14 +598,10 @@ <artifactId>filters</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-08 08:19:36 UTC (rev 5976) @@ -227,8 +227,7 @@ addDependency(new Project("commons-io", "commons-io", "jar", "1.4")). addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")). addDependency(new Project("net.oauth", "core", "jar", "20080621")). - addDependency(new Project("com.google.guava", "guava", "jar", "r07")). - addDependency(new Project("com.google.javascript", "closure-compiler", "jar", "r706")). + addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")). addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")). addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")). addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")). @@ -299,4 +298,3 @@ return module; } - \ No newline at end of file Modified: portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -590,14 +590,10 @@ <artifactId>filters</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/pom.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -796,9 +796,9 @@ <version>20080621</version> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>r07</version> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0-rc2</version> </dependency> <dependency> <groupId>com.google.code.guice</groupId> @@ -811,11 +811,6 @@ <version>2.0</version> </dependency> <dependency> - <groupId>com.google.javascript</groupId> - <artifactId>closure-compiler</artifactId> - <version>r706</version> - </dependency> - <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> <version>0.9</version> @@ -905,7 +900,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <resources> <resource> Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-03-08 07:59:16 UTC (rev 5975) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-03-08 08:19:36 UTC (rev 5976) @@ -39,17 +39,6 @@ </init-params> </component-plugin> <component-plugin> - <name>ClosureCompressorPlugin</name> - <set-method>registerCompressorPlugin</set-method> - <type>org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin</type> - <init-params> - <value-param> - <name>plugin.priority</name> - <value>1</value> - </value-param> - </init-params> - </component-plugin> - <component-plugin> <name>YUICSSCompressorPlugin</name> <set-method>registerCompressorPlugin</set-method> <type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type>

13 years, 6 months

1
0
0 / 0

gatein SVN: r5975 - in portal/branches/idm: web/portal/src/main/webapp/WEB-INF/conf/organization and 1 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-03-08 02:59:16 -0500 (Tue, 08 Mar 2011) New Revision: 5975 Added: portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/acme-2ldap.ldif portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-2ldap-config.xml Modified: portal/branches/idm/pom.xml portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: - ldap config try Modified: portal/branches/idm/pom.xml =================================================================== --- portal/branches/idm/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) +++ portal/branches/idm/pom.xml 2011-03-08 07:59:16 UTC (rev 5975) @@ -47,7 +47,7 @@ <org.gatein.common.version>2.0.3-GA</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Alpha02</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version> - <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm> + <org.picketlink.idm>1.3.0.Alpha01-SNAPSHOT</org.picketlink.idm> <org.gatein.wsrp.version>2.0.0-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> Modified: portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-03-08 06:43:52 UTC (rev 5974) +++ portal/branches/idm/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-03-08 07:59:16 UTC (rev 5975) @@ -68,6 +68,9 @@   +  +  +   @@ -185,6 +188,26 @@ </entry> --> +  +  +   + +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>idm_realm_sample-portal</id> + <repository-id-ref>DefaultPortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + <options> + <option> + <name>cache.providerRegistryName</name> + <value>apiCacheProvider</value> + </option> + </options> + </realm> + <realm> + <id>idm_realm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + <options> + <option> + <name>template</name> + <value>true</value> + </option> + <option> + <name>cache.providerRegistryName</name> + <value>apiCacheProvider</value> + </option> + </options> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>LDAP_1</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>internal_role</identity-object-type> + <identity-object-type>internal_ou</identity-object-type> + </identity-object-types> + <options> + </options> + </identity-store-mapping> + <identity-store-mapping> + <identity-store-id>LDAP_2</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>customers_role</identity-object-type> + <identity-object-type>customers_ou</identity-object-type> + </identity-object-types> + <options> + </options> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>DefaultPortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + +  + <identity-store> + <id>LDAP_1</id> + <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + <attribute> + <name>firstName</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>lastName</name> + <mapping>sn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=portal1,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>internal_role</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>internal_role</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes> + <attribute> + <name>label</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>true</isReadOnly> + </attribute> + <attribute> + <name>description</name> + <mapping>description</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Roles,o=portal1,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>internal_ou</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>internal_ou</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes> + <attribute> + <name>label</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>true</isReadOnly> + </attribute> + <attribute> + <name>description</name> + <mapping>description</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=OrganizationUnits,o=portal1,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + <option> + <name>createMissingContexts</name> + <value>true</value> + </option> + <option> + <name>customJNDIConnectionParameters</name> + <value>com.sun.jndi.ldap.connect.pool=true</value> + </option> + <option> + <name>customSystemProperties</name> + <value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value> + <value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value> + </option> + </options> + </identity-store> + +  + <identity-store> + <id>LDAP_2</id> + <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + <attribute> + <name>firstName</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>lastName</name> + <mapping>sn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + <attribute> + <name>email</name> + <mapping>mail</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + <isUnique>true</isUnique> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=portal2,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>customers_role</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>customers_role</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes> + <attribute> + <name>label</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>true</isReadOnly> + </attribute> + <attribute> + <name>description</name> + <mapping>description</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Roles,o=portal2,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>customers_ou</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>customers_ou</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes> + <attribute> + <name>label</name> + <mapping>cn</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>true</isReadOnly> + </attribute> + <attribute> + <name>description</name> + <mapping>description</mapping> + <type>text</type> + <isRequired>false</isRequired> + <isMultivalued>false</isMultivalued> + <isReadOnly>false</isReadOnly> + </attribute> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=OrganizationUnits,o=portal2,o=trunk,dc=idm,dc=picketlink,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + <option> + <name>createMissingContexts</name> + <value>true</value> + </option> + <option> + <name>customJNDIConnectionParameters</name> + <value>com.sun.jndi.ldap.connect.pool=true</value> + </option> + <option> + <name>customSystemProperties</name> + <value>com.sun.jndi.ldap.connect.pool.maxsize=300000</value> + <value>com.sun.jndi.ldap.connect.pool.protocol=plain ssl</value> + </option> + </options> + </identity-store> + + </identity-stores> + </stores> + <options> + <option> + <name>defaultTemplate</name> + <value>idm_realm</value> + </option> + </options> +</jboss-identity> \ No newline at end of file

13 years, 6 months

1
0
0 / 0

gatein SVN: r5974 - in portal/branches/branch-GTNPORTAL-1822: component/web/resources and 9 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-03-08 01:43:52 -0500 (Tue, 08 Mar 2011) New Revision: 5974 Added: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml portal/branches/branch-GTNPORTAL-1822/pom.xml portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml Log: GTNPORTAL-198: Use the Closure compiler in the Javascript serving engine Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -49,6 +49,10 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> <scope>test</scope> Added: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java (rev 0) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java 2011-03-08 06:43:52 UTC (rev 5974) @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2011 eXo Platform SAS. + * + * 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.exoplatform.portal.resource.compressor.impl; + +import com.google.javascript.jscomp.CheckLevel; +import com.google.javascript.jscomp.CompilationLevel; +import com.google.javascript.jscomp.Compiler; +import com.google.javascript.jscomp.CompilerOptions; +import com.google.javascript.jscomp.JSSourceFile; +import com.google.javascript.jscomp.WarningLevel; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.portal.resource.compressor.BaseResourceCompressorPlugin; +import org.exoplatform.portal.resource.compressor.ResourceCompressorException; +import org.exoplatform.portal.resource.compressor.ResourceType; +import java.io.Reader; +import java.io.Writer; + +public class ClosureCompressorPlugin extends BaseResourceCompressorPlugin +{ + + public ClosureCompressorPlugin(InitParams params) throws Exception + { + super(params); + } + + public ResourceType getResourceType() + { + return ResourceType.JAVASCRIPT; + } + + public void compress(Reader input, Writer output) throws ResourceCompressorException + { + Compiler compiler = new Compiler(); + CompilerOptions options = new CompilerOptions(); + CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options); + WarningLevel.QUIET.setOptionsForWarningLevel(options); + JSSourceFile extern = JSSourceFile.fromCode("extern", ""); + + JSSourceFile jsInput; + try + { + String code = JSSourceFile.fromReader("code", input).getCode(); + jsInput = JSSourceFile.fromCode("jsInput", code); + compiler.compile(extern, jsInput, options); + output.write(compiler.toSource()); + } + catch (Exception ex) + { + throw new ResourceCompressorException(ex); + } + } +} Modified: portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-03-08 06:43:52 UTC (rev 5974) @@ -18,19 +18,32 @@ */ package org.exoplatform.portal.resource.compressor; +import com.google.javascript.jscomp.*; +import com.google.javascript.jscomp.Compiler; +import org.apache.commons.io.IOUtils; +import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.component.test.AbstractKernelTest; import org.exoplatform.component.test.ConfigurationUnit; import org.exoplatform.component.test.ConfiguredBy; import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.Parameter; +import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin; import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; import java.io.Reader; import java.io.Writer; +import java.util.Scanner; /** * @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a> @@ -85,6 +98,66 @@ + jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")"); } + public void testClosureCompressing() throws Exception + { + File jsFile = new File("src/test/resources/javascript.js"); + File jsCompressedFile = new File("target/closure-compressed-file.js"); + Reader reader = new FileReader(jsFile); + Writer writer = new FileWriter(jsCompressedFile); + + ResourceCompressorService compressor = + (ResourceCompressorService)getContainer().getComponentInstanceOfType(ResourceCompressor.class); + + InitParams priorityParam = new InitParams(); + ValueParam param = new ValueParam(); + param.setName("plugin.priority"); + param.setValue("10"); + priorityParam.addParameter(param); + compressor.registerCompressorPlugin(new ClosureCompressorPlugin(priorityParam)); + try + { + compressor.compress(reader, writer, ResourceType.JAVASCRIPT); + } + catch (Exception e) + { + fail(e.getLocalizedMessage()); + } + finally + { + reader.close(); + writer.close(); + } + + assertTrue(jsCompressedFile.length() > 0); + assertTrue(jsFile.length() > jsCompressedFile.length()); + log.info("The original javascript (" + getFileSize(jsFile) + ") is compressed by CLOSURE COMPILER into " + + jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")"); + + String expectedJS = closureCompress(jsFile); + assertEquals(expectedJS.length(), jsCompressedFile.length()); + } + + private String closureCompress(File input) throws Exception + { + Compiler compiler = new Compiler(); + CompilerOptions options = new CompilerOptions(); + CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options); + JSSourceFile extern = JSSourceFile.fromCode("", ""); + + JSSourceFile jsInput; + try + { + jsInput = JSSourceFile.fromFile(input); + } + catch (Exception ex) + { + throw new ResourceCompressorException(ex); + } + + compiler.compile(extern, jsInput, options); + return compiler.toSource(); + } + public void testYUICSSCompressing() throws IOException { File cssFile = new File("src/test/resources/Stylesheet.css"); Modified: portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/gadgets/server/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -86,8 +86,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as5/pkg/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -599,10 +599,14 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jboss-as6/pkg/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -590,10 +590,14 @@ <version>2.0.235</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/packaging/jetty/pkg/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -598,10 +598,14 @@ <artifactId>filters</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/packaging/module/src/main/javascript/portal.packaging.module.js 2011-03-08 06:43:52 UTC (rev 5974) @@ -227,7 +227,8 @@ addDependency(new Project("commons-io", "commons-io", "jar", "1.4")). addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3")). addDependency(new Project("net.oauth", "core", "jar", "20080621")). - addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")). + addDependency(new Project("com.google.guava", "guava", "jar", "r07")). + addDependency(new Project("com.google.javascript", "closure-compiler", "jar", "r706")). addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")). addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")). addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")). @@ -298,3 +299,4 @@ return module; } + \ No newline at end of file Modified: portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/packaging/tomcat/pkg/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -590,10 +590,14 @@ <artifactId>filters</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> </dependency> Modified: portal/branches/branch-GTNPORTAL-1822/pom.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/pom.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/pom.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -796,9 +796,9 @@ <version>20080621</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r07</version> </dependency> <dependency> <groupId>com.google.code.guice</groupId> @@ -811,6 +811,11 @@ <version>2.0</version> </dependency> <dependency> + <groupId>com.google.javascript</groupId> + <artifactId>closure-compiler</artifactId> + <version>r706</version> + </dependency> + <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> <version>0.9</version> @@ -900,7 +905,7 @@ <scope>test</scope> </dependency> </dependencies> - + <build> <resources> <resource> Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-03-08 04:07:03 UTC (rev 5973) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-03-08 06:43:52 UTC (rev 5974) @@ -39,6 +39,17 @@ </init-params> </component-plugin> <component-plugin> + <name>ClosureCompressorPlugin</name> + <set-method>registerCompressorPlugin</set-method> + <type>org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin</type> + <init-params> + <value-param> + <name>plugin.priority</name> + <value>1</value> + </value-param> + </init-params> + </component-plugin> + <component-plugin> <name>YUICSSCompressorPlugin</name> <set-method>registerCompressorPlugin</set-method> <type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type>

13 years, 6 months

1
0
0 / 0

gatein SVN: r5973 - in portal/branches/branch-GTNPORTAL-1822/web: portal/src/main/webapp/groovy/portal/webui/portal and 1 other directory.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2011-03-07 23:07:03 -0500 (Mon, 07 Mar 2011) New Revision: 5973 Modified: portal/branches/branch-GTNPORTAL-1822/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl Log: GTNPORTAL-1184 IE6: when change language to Arabic, the resize button on the right of page_editor component is broken Modified: portal/branches/branch-GTNPORTAL-1822/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2011-03-08 03:20:22 UTC (rev 5972) +++ portal/branches/branch-GTNPORTAL-1822/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2011-03-08 04:07:03 UTC (rev 5973) @@ -115,10 +115,6 @@ float: left; /* orientation=rt */ cursor: nw-resize; /* orientation=lt */ cursor: ne-resize; /* orientation=rt */ - position: absolute; - bottom: 8px; - right: 8px; /* orientation=lt */ - left: 8px; /* orientation=rt */ } .UIPopupWindow .BottomLeftCornerDecorator { @@ -272,11 +268,6 @@ .UIPortalComposer .BCPortalComposer { background: #ececec; border: 1px solid #bbbcc2; - height: 50px; -} - -.UIPortalComposer .BCPortalComposer { - } .UIPortalComposer .Bottom { Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-03-08 03:20:22 UTC (rev 5972) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2011-03-08 04:07:03 UTC (rev 5973) @@ -46,7 +46,7 @@ <div class="BLPortalComposer" style="display: <%=uicomponent.isCollapsed ? "none": "block"%>"> <div class="BRPortalComposer"> - <div class="BCPortalComposer"> + <div class="BCPortalComposer ClearFix"> <div class="UIAction"> <table class="ActionContainer"> <tr>

13 years, 6 months

1
0
0 / 0

gatein SVN: r5972 - in portal/branches/branch-GTNPORTAL-1822: portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component and 2 other directories.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-03-07 22:20:22 -0500 (Mon, 07 Mar 2011) New Revision: 5972 Modified: portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties Log: GTNPORTAL-1234 Save nodeName instead of resourceBundle key for Default tab dashboard Modified: portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-03-08 03:20:22 UTC (rev 5972) @@ -30,7 +30,11 @@ <div class="TabsContainer ClearFix"> <% for(int i = 0;i < tabNbs;i++){ node = nodes.get(i); - String tabLabel = node.getResolvedLabel(); + def tabLabel = node.getLabel(); + if ("Tab_Default".equals(node.getName())) + { + tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); + } String param = "" + i; if(node.getUri().equals(selectedNode.getUri())){ %> @@ -40,7 +44,7 @@ <div class="RightTab"> <div class="MiddleTab"> <% - String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this," + i + ",\"" + node.getResolvedLabel() + "\")"; + String ondblclick = "eXo.webui.UITabbedDashboard.showEditLabelInput(this," + i + ",\"" + tabLabel + "\")"; %> <span ondblclick='$ondblclick'>$tabLabel</span> <a href="<%= uicomponent.url("DeleteTab",param); %>"> Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-08 03:20:22 UTC (rev 5972) @@ -130,7 +130,7 @@ PageNode pageNode = new PageNode(); pageNode.setName(_nodeName); - pageNode.setLabel("UIUserToolBarDashboard.page.ClickAndType"); + pageNode.setLabel(_nodeName); pageNode.setUri(_nodeName); pageNode.setPageReference(page.getPageId()); Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-08 03:20:22 UTC (rev 5972) @@ -52,15 +52,16 @@ String href = Util.getPortalRequestContext().getPortalURI() + node.getUri(); String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; - if (uicomponent.DEFAULT_TAB_NAME.equals(node.getName())) + def resolvedLabel = node.getLabel(); + if ("Tab_Default".equals(node.getName())) { - node.setResolvedLabel(_ctx.appRes(node.getLabel())); + resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); } - boolean toolong = (node.resolvedLabel.length() > 60); - String label = ( toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel); + boolean toolong = (resolvedLabel.length() > 60); + String label = ( toolong ? resolvedLabel.substring(0, 57) + "..." : resolvedLabel); String title = ""; - if(toolong) title = "title='$node.resolvedLabel'"; + if(toolong) title = "title='$resolvedLabel'"; else title = ""; print """ <div class="MenuItem $tabStyleNavigation"> Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1418,7 +1418,7 @@ UIListPermissionSelectorPopup.title.ListPermissionSelector=Select Permission -UIUserToolBarDashboard.page.ClickAndType=Click & Type Page Name +UIUserToolBarDashboard.page.Tab_Default=Click & Type Page Name ####################################################################### # org.exoplatform.webui.core.UIConfirmation # Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1309,7 +1309,7 @@ UIGadget.tooltip.editGadget=Editer la Gadget UIGadget.tooltip.deleteGadget=Supprimer la Gadget -UIUserToolBarDashboard.page.ClickAndType=Cliquez pour renommer +UIUserToolBarDashboard.page.Tab_Default=Cliquez pour renommer Locale.zh_CN=Chinois simplifié Locale.zh_TW=Chinois traditionnel Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_it.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1410,7 +1410,7 @@ UIListPermissionSelectorPopup.title.ListPermissionSelector=Seleziona il Permesso -UIUserToolBarDashboard.page.ClickAndType=Clicca e inserisci il nome della pagina +UIUserToolBarDashboard.page.Tab_Default=Clicca e inserisci il nome della pagina ####################################################################### # org.exoplatform.webui.core.UIConfirmation # Modified: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-03-07 11:37:38 UTC (rev 5971) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2011-03-08 03:20:22 UTC (rev 5972) @@ -1352,4 +1352,4 @@ UIGadget.message.isLossData=Gadget này có thể đã bị xóa khỏi cơ sở dữ liệu hoặc việc đọc gadget từ cơ sở dữ liệu xảy ra lỗi UIListPermissionSelectorPopup.title.ListPermissionSelector=Lựa chọn quyền -UIUserToolBarDashboard.page.ClickAndType=Nhấp chuột và điền tên trang +UIUserToolBarDashboard.page.Tab_Default=Nhấp chuột và điền tên trang

13 years, 6 months

1
0
0 / 0

gatein SVN: r5971 - in portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main: webapp/groovy/admintoolbar/webui/component and 1 other directory.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-03-07 06:37:38 -0500 (Mon, 07 Mar 2011) New Revision: 5971 Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl Log: GTNPORTAL-1234 Still display Vietnamese language in default tab of dashboard after change to French Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 09:58:41 UTC (rev 5970) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 11:37:38 UTC (rev 5971) @@ -49,7 +49,7 @@ public class UIUserToolBarDashboardPortlet extends UIPortletApplication { - public static String DEFAULT_TAB_NAME = "Tab_0"; + public static String DEFAULT_TAB_NAME = "Tab_Default"; public UIUserToolBarDashboardPortlet() throws Exception { @@ -130,8 +130,7 @@ PageNode pageNode = new PageNode(); pageNode.setName(_nodeName); - pageNode.setLabel(prContext.getApplicationResourceBundle().getString("UIUserToolBarDashboard.page.ClickAndType")); - pageNode.setResolvedLabel(prContext.getApplicationResourceBundle()); + pageNode.setLabel("UIUserToolBarDashboard.page.ClickAndType"); pageNode.setUri(_nodeName); pageNode.setPageReference(page.getPageId()); Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 09:58:41 UTC (rev 5970) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) @@ -52,6 +52,11 @@ String href = Util.getPortalRequestContext().getPortalURI() + node.getUri(); String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; + if (uicomponent.DEFAULT_TAB_NAME.equals(node.getName())) + { + node.setResolvedLabel(_ctx.appRes(node.getLabel())); + } + boolean toolong = (node.resolvedLabel.length() > 60); String label = ( toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel); String title = ""; @@ -121,4 +126,4 @@ </div> </div> </div> -<% } %> +<% } %>

13 years, 6 months

1
0
0 / 0

gatein SVN: r5970 - portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2011-03-07 04:58:41 -0500 (Mon, 07 Mar 2011) New Revision: 5970 Removed: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy Log: GTNPORTAL-1807 Remove SkinConfigOption.goorvy file which is not used anymore Deleted: portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy =================================================================== --- portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy 2011-03-07 09:40:02 UTC (rev 5969) +++ portal/branches/branch-GTNPORTAL-1822/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy 2011-03-07 09:58:41 UTC (rev 5970) @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * 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. - */ - -import java.util.List; -import java.util.ArrayList; -import org.exoplatform.webui.core.model.SelectItemCategory; -import org.exoplatform.webui.core.model.SelectItemOption; - -List categories = new ArrayList(); - - SelectItemCategory skinDefault = new SelectItemCategory("Default", false); - skinDefault.addSelectItemOption(new SelectItemOption("Default", "Default", "Default")); - skinDefault.setSelected(true); - categories.add(skinDefault); - - SelectItemCategory skinMac = new SelectItemCategory("Mac", false); - skinMac.addSelectItemOption(new SelectItemOption("Mac", "Mac", "Mac")); - categories.add(skinMac); - - SelectItemCategory skinVista = new SelectItemCategory("Vista", false); - skinVista.addSelectItemOption(new SelectItemOption("Vista", "Vista", "Vista")); - categories.add(skinVista); - -return categories; \ No newline at end of file

13 years, 6 months

1
0
0 / 0

gatein SVN: r5969 - portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2011-03-07 04:40:02 -0500 (Mon, 07 Mar 2011) New Revision: 5969 Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js Log: fix_labpixies_gadgets.patch Modified: portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js =================================================================== --- portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-04 09:23:32 UTC (rev 5968) +++ portal/branches/shindig2/gadgets/server/src/main/webapp/containers/default/container.js 2011-03-07 09:40:02 UTC (rev 5969) @@ -132,8 +132,8 @@ "gadgets.features" : { "core.io" : { // Note: /proxy is an open proxy. Be careful how you expose this! - "proxyUrl" : "http://%host%/eXoGadgetServer/gadgets/proxy?refresh=%refresh%&url=%url%", - "jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest" + "proxyUrl" : "//%host%/eXoGadgetServer/gadgets/proxy?container=default&refresh=%refresh%&url=%url%%rewriteMime%", + "jsonProxyUrl" : "//%host%/eXoGadgetServer/gadgets/makeRequest" }, "views" : { "home" : { @@ -169,16 +169,25 @@ "ANCHOR_COLOR": "" } }, - "opensocial-0.8" : { + "opensocial" : { // Path to fetch opensocial data from // Must be on the same domain as the gadget rendering server "path" : "http://%host%/rpc", + // Path to issue invalidate calls "invalidatePath" : "http://%host%/rpc", "domain" : "shindig", "enableCaja" : false, "supportedFields" : { "person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"], - "activity" : ["id", "title"] + "activity" : ["appId", "body", "bodyId", "externalId", "id", "mediaItems", "postedTime", "priority", + "streamFaviconUrl", "streamSourceUrl", "streamTitle", "streamUrl", "templateParams", "title", + "url", "userId"], + "activityEntry" : ["icon", "postedTime", "actor", "verb", "object", "target", "generator", "provider", "title", + "body", "standardLinks", "to", "cc", "bcc"], + "album" : ["id", "thumbnailUrl", "title", "description", "location", "ownerId"], + "mediaItem" : ["album_id", "created", "description", "duration", "file_size", "id", "language", "last_updated", + "location", "mime_type", "num_comments", "num_views", "num_votes", "rating", "start_time", + "tagged_people", "tags", "thumbnail_url", "title", "type", "url"] } }, "osapi.services" : {

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2011