Seam SVN: r7184 - trunk/build.
by seam-commits@lists.jboss.org
Author: alesj
Date: 2008-01-22 09:31:21 -0500 (Tue, 22 Jan 2008)
New Revision: 7184
Modified:
trunk/build/root.pom.xml
Log:
Typo.
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-01-22 14:16:30 UTC (rev 7183)
+++ trunk/build/root.pom.xml 2008-01-22 14:31:21 UTC (rev 7184)
@@ -738,7 +738,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs&…
[View More]lt;/artifactId>
- <version>2.0.0-Beta7</version>
+ <version>2.0.0.Beta7</version>
</dependency>
<dependency>
[View Less]
17 years, 1 month
Seam SVN: r7183 - in trunk: src/jbas5 and 5 other directories.
by seam-commits@lists.jboss.org
Author: alesj
Date: 2008-01-22 09:16:30 -0500 (Tue, 22 Jan 2008)
New Revision: 7183
Added:
trunk/src/jbas5/org/
trunk/src/jbas5/org/jboss/
trunk/src/jbas5/org/jboss/seam/
trunk/src/jbas5/org/jboss/seam/as5/
trunk/src/jbas5/org/jboss/seam/as5/vfs/
trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Modified:
trunk/build/jbas5.pom.xml
trunk/build/root.pom.xml
Log:
JBoss VFS aware scanner.
Modified: trunk/build/jbas5.pom.xml
=============================================…
[View More]======================
--- trunk/build/jbas5.pom.xml 2008-01-22 13:11:59 UTC (rev 7182)
+++ trunk/build/jbas5.pom.xml 2008-01-22 14:16:30 UTC (rev 7183)
@@ -20,7 +20,11 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-01-22 13:11:59 UTC (rev 7182)
+++ trunk/build/root.pom.xml 2008-01-22 14:16:30 UTC (rev 7183)
@@ -736,6 +736,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.0.0-Beta7</version>
+ </dependency>
+
+ <dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>2.0.7</version>
Added: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java (rev 0)
+++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-22 14:16:30 UTC (rev 7183)
@@ -0,0 +1,105 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.seam.as5.vfs;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.List;
+
+import org.jboss.seam.deployment.AbstractScanner;
+import org.jboss.seam.deployment.DeploymentStrategy;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss VSF aware scanner.
+ *
+ * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a>
+ */
+public class VFSScanner extends AbstractScanner
+{
+ private static final LogProvider log = Logging.getLogProvider(VFSScanner.class);
+
+ public VFSScanner(DeploymentStrategy deploymentStrategy)
+ {
+ super(deploymentStrategy);
+ }
+
+ public void scanDirectories(File[] directories)
+ {
+ for (File dir : directories)
+ {
+ try
+ {
+ VirtualFile root = VFS.getRoot(dir.toURI());
+ handleRoot(root);
+ }
+ catch (IOException e)
+ {
+ log.warn("Cannot scan directory " + dir, e);
+ }
+ }
+ }
+
+ public void scanResources(String[] resources)
+ {
+ for (String resourceName : resources)
+ {
+ try
+ {
+ Enumeration<URL> urlEnum = getDeploymentStrategy().getClassLoader().getResources(resourceName);
+ while (urlEnum.hasMoreElements())
+ {
+ URL url = urlEnum.nextElement();
+ VirtualFile root = VFS.getRoot(url);
+ handleRoot(root);
+ }
+ }
+ catch (IOException ioe)
+ {
+ log.warn("Cannot read resource: " + resourceName, ioe);
+ }
+ }
+ }
+
+ /**
+ * Handle virtual file root.
+ *
+ * @param file the virtual file root
+ * @throws IOException for any error
+ */
+ protected void handleRoot(VirtualFile file) throws IOException
+ {
+ List<VirtualFile> children = file.getChildrenRecursively();
+ for (VirtualFile child : children)
+ {
+ if (child.isLeaf())
+ {
+ getDeploymentStrategy().handle(child.getPathName());
+ }
+ }
+ }
+}
[View Less]
17 years, 1 month
Seam SVN: r7182 - trunk/src/main/org/jboss/seam/deployment.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 08:11:59 -0500 (Tue, 22 Jan 2008)
New Revision: 7182
Modified:
trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
trunk/src/main/org/jboss/seam/deployment/Scanner.java
trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
trunk/src/main/org/jboss/seam/…
[View More]deployment/URLScanner.java
Log:
Rework deployment to not rely on classloader scanning
Modified: trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/DeploymentStrategy.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -37,25 +37,8 @@
/**
* Do the scan for resources
*
- * If {@link #getResourceNames()} are specified, then {@link Scanner#scanResources()}
- * will be used, otherwise {@link Scanner#scanClassLoader()} will be used.
*/
- public void scan()
- {
- if (getResourceNames() == null)
- {
- getScanner().scanClassLoader();
- }
- else
- {
- getScanner().scanResources();
- }
- }
-
- /**
- * Get the resource names which this {@link DeploymentStrategy} will scan for.
- */
- public abstract String[] getResourceNames();
+ public abstract void scan();
/**
* Get the scanner being used
@@ -73,17 +56,6 @@
* Get the classloader to use
*/
public abstract ClassLoader getClassLoader();
-
- /**
- * Sometimes the main classloader cannot be scanned, so a scannable
- * classloader can be provided
- *
- * By default the classloader specified in {@link #getClassLoader()}
- */
- public ClassLoader getScannableClassLoader()
- {
- return getClassLoader();
- }
/**
* Get (or modify) any registered {@link DeploymentHandler}s
Modified: trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -64,19 +64,6 @@
}
@Override
- public ClassLoader getScannableClassLoader()
- {
- if (classLoader != null)
- {
- return classLoader.getParent();
- }
- else
- {
- return null;
- }
- }
-
- @Override
public Set<Class<Object>> getScannedComponentClasses()
{
Set<Class<Object>> set = new HashSet<Class<Object>>();
Modified: trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/HotDeploymentStrategy.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -103,12 +103,6 @@
{
return hotDeployClassLoader;
}
-
- @Override
- public String[] getResourceNames()
- {
- return null;
- }
/**
* Get all Components which the strategy has scanned and handled
@@ -117,4 +111,11 @@
{
return componentDeploymentHandler.getClasses();
}
+
+ @Override
+ public void scan()
+ {
+ getScanner().scanDirectories(getHotDeploymentPaths());
+
+ }
}
Modified: trunk/src/main/org/jboss/seam/deployment/Scanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/Scanner.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/Scanner.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -1,5 +1,7 @@
package org.jboss.seam.deployment;
+import java.io.File;
+
/**
* The Scanner is used to find resources to be processed by Seam
*
@@ -11,22 +13,18 @@
public interface Scanner
{
/**
- * Scan the "scannable" classloader.
+ * Recursively scan directories
*
- * Method should scan the {@link DeploymentStrategy#getScannableClassLoader()}
- * and pass all found resources to {@link DeploymentStrategy#handle(String)}
- * to be processed by any registered deployment handlers
+ * @param directories An array of the roots of the directory trees to scan
*/
- public void scanClassLoader();
+ public void scanDirectories(File[] directories);
/**
- * Scan any classloader containing the given resource.
+ * Scan for structures which contain any of the given resources in their root
*
- * Method should scan any classloader containing {@link DeploymentStrategy#getResourceNames()}
- * and pass all found resources to {@link DeploymentStrategy#handle(String)}
- * to be processed by any registered deployment handlers
+ * @param resources The resources to scan for
*/
- public void scanResources();
+ public void scanResources(String[] resources);
/**
* Get the deployment strategy this scanner is used by
Modified: trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -36,12 +36,6 @@
{
return classLoader;
}
-
- @Override
- public String[] getResourceNames()
- {
- return RESOURCE_NAMES;
- }
/**
* Get all scanned and handled annotated components known to this strategy
@@ -67,4 +61,10 @@
return namespaceDeploymentHandler.getPackages();
}
+ @Override
+ public void scan()
+ {
+ getScanner().scanResources(RESOURCE_NAMES);
+ }
+
}
Modified: trunk/src/main/org/jboss/seam/deployment/URLScanner.java
===================================================================
--- trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-01-22 13:05:54 UTC (rev 7181)
+++ trunk/src/main/org/jboss/seam/deployment/URLScanner.java 2008-01-22 13:11:59 UTC (rev 7182)
@@ -32,25 +32,18 @@
super(deploymentStrategy);
}
- public void scanClassLoader()
+ public void scanDirectories(File[] directories)
{
- Set<String> paths = new HashSet<String>();
- for ( URL url: getURLsFromClassLoader() )
+ for (File directory : directories)
{
- String urlPath = url.getFile();
- if ( urlPath.endsWith("/") )
- {
- urlPath = urlPath.substring( 0, urlPath.length()-1 );
- }
- paths.add( urlPath );
+ handleDirectory(directory, null);
}
- handle(paths);
}
- public void scanResources()
+ public void scanResources(String[] resources)
{
Set<String> paths = new HashSet<String>();
- for (String resourceName : getDeploymentStrategy().getResourceNames())
+ for (String resourceName : resources)
{
try
{
@@ -112,18 +105,6 @@
}
}
- private URL[] getURLsFromClassLoader()
- {
- if (getDeploymentStrategy().getScannableClassLoader() instanceof URLClassLoader)
- {
- return ( (URLClassLoader) getDeploymentStrategy().getScannableClassLoader()).getURLs();
- }
- else
- {
- return new URL[0];
- }
- }
-
private void handleArchiveByFile(File file) throws IOException
{
log.debug("archive: " + file);
[View Less]
17 years, 1 month
Seam SVN: r7181 - trunk.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 08:05:54 -0500 (Tue, 22 Jan 2008)
New Revision: 7181
Modified:
trunk/release-process.txt
Log:
Add JBDS tests to release process
Modified: trunk/release-process.txt
===================================================================
--- trunk/release-process.txt 2008-01-22 12:39:47 UTC (rev 7180)
+++ trunk/release-process.txt 2008-01-22 13:05:54 UTC (rev 7181)
@@ -35,7 +35,7 @@
- jpa
- hibernate
-Test seam-gen
+Test seam-gen & …
[View More]JBDS
-------------
* export the following tables to MySQL:
@@ -64,7 +64,17 @@
* run "seam new-action new-form restart"
- test both generated pages
- run the unit tests in eclipse using the TestNG plugin
+* Create a new war project in JBDS
+ - Reverse engineer entities from MySQL
+ - Test generated pages (check hot deployment of Seam components, html)
+ - Test running unit tests from Eclipse
+* Create a new ear project in JBDS
+ - Reverse engineer entities from MySQL
+ - Test generated pages (check hot deployment of Seam components, html)
+ - Test running unit tests from Eclipse
+
+
Tag CVS
-------
* "cvs rtag JBoss_Seam_x_x_x_XX jboss-seam"
[View Less]
17 years, 1 month
Seam SVN: r7180 - trunk/build.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 07:39:47 -0500 (Tue, 22 Jan 2008)
New Revision: 7180
Modified:
trunk/build/utilities.build.xml
Log:
Fix build
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-01-22 11:59:56 UTC (rev 7179)
+++ trunk/build/utilities.build.xml 2008-01-22 12:39:47 UTC (rev 7180)
@@ -31,7 +31,6 @@
<sequential>
<artifact:dependencies pathId="@{scope}…
[View More].(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}">
<pom file="@{pom}" />
- <remoterepository refid="local.repository" />
</artifact:dependencies>
</sequential>
</macrodef>
@@ -43,7 +42,6 @@
<sequential>
<artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset">
<pom file="@{pom}" />
- <remoterepository refid="local.repository" />
</artifact:dependencies>
</sequential>
</macrodef>
@@ -111,14 +109,6 @@
</sequential>
</macrodef>
- <macrodef name="deployLocal">
- <attribute name="pom" default="" />
- <attribute name="jar" default="" />
- <sequential>
- <deploy pom="@{pom}" jar="@{jar}" repositoryId="local.repository" />
- </sequential>
- </macrodef>
-
<!-- Copy dependencies from a given pom/scope to a directory, flattening
the directory structure and version information -->
<macrodef name="copyDependencies">
[View Less]
17 years, 1 month
Seam SVN: r7179 - trunk/examples/icefaces.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 06:59:56 -0500 (Tue, 22 Jan 2008)
New Revision: 7179
Modified:
trunk/examples/icefaces/build.xml
Log:
correct ordering
Modified: trunk/examples/icefaces/build.xml
===================================================================
--- trunk/examples/icefaces/build.xml 2008-01-22 11:58:33 UTC (rev 7178)
+++ trunk/examples/icefaces/build.xml 2008-01-22 11:59:56 UTC (rev 7179)
@@ -13,6 +13,7 @@
<!-- Add icefaces -->
<property name="…
[View More]example.tmp.lib.dir" value="${basedir}/lib" />
+ <property name="clean.extra" value="${example.tmp.lib.dir}"/>
<!-- Datasource -->
<property name="example.ds" value="seam-icefaces-ds.xml" />
@@ -23,8 +24,6 @@
<include name="*.jar" />
</fileset>
- <property name="clean.extra" value="${example.tmp.lib.dir}"/>
-
<target name="copyextradependencies">
<artifact:dependencies filesetId="icefaces.fileset" versionsId="icefaces.versions">
<dependency groupId="org.icefaces" artifactId="icefaces" version="1.6.1">
[View Less]
17 years, 1 month
Seam SVN: r7178 - trunk/examples.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 06:58:33 -0500 (Tue, 22 Jan 2008)
New Revision: 7178
Modified:
trunk/examples/build.xml
Log:
Minor
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-01-22 11:53:35 UTC (rev 7177)
+++ trunk/examples/build.xml 2008-01-22 11:58:33 UTC (rev 7178)
@@ -465,7 +465,6 @@
<!-- Compile the source code, directly into the jar -->
<target name="compile" …
[View More]depends="init, select-compiler">
- <echo>lib is ${lib.dir}</echo>
<javac classpathref="build.classpath" destdir="${jar.dir}" debug="${javac.debug}" deprecation="${javac.deprecation}" nowarn="on" >
<src path="${src.java.dir}" />
</javac>
[View Less]
17 years, 1 month
Seam SVN: r7177 - trunk/build.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-22 06:53:35 -0500 (Tue, 22 Jan 2008)
New Revision: 7177
Modified:
trunk/build/common.build.xml
Log:
minor
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-01-22 06:46:48 UTC (rev 7176)
+++ trunk/build/common.build.xml 2008-01-22 11:53:35 UTC (rev 7177)
@@ -78,7 +78,6 @@
<property name="coverage.dir" value="${seam.dir}/coverage-output" />
…
[View More] <property name="coverage.ec" value="${coverage.dir}/coverage.ec" />
- <artifact:remoteRepository id="local.repository" url="file://${build.dir}/repository" />
<artifact:remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
[View Less]
17 years, 1 month
Seam SVN: r7176 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/core/action/prefs and 5 other directories.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-01-22 01:46:48 -0500 (Tue, 22 Jan 2008)
New Revision: 7176
Modified:
trunk/examples/wiki/src/etc/messages_en.properties
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java
trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml
trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml
trunk/examples/wiki/view/themes/default/template.xhtml
trunk/examples/wiki/view/themes/…
[View More]sfwkorg/css/mainMenu.css
trunk/examples/wiki/view/themes/sfwkorg/template.xhtml
Log:
Configuration switch for site feed in main menu
Modified: trunk/examples/wiki/src/etc/messages_en.properties
===================================================================
--- trunk/examples/wiki/src/etc/messages_en.properties 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/src/etc/messages_en.properties 2008-01-22 06:46:48 UTC (rev 7176)
@@ -666,6 +666,7 @@
lacewiki.preferences.wiki.MainMenuShowAdminOnly=Main menu includes only directories owned by system administrator
lacewiki.preferences.wiki.ShowDocumentCreatorHistory=Show document creator/edit history in document footer
lacewiki.preferences.wiki.ShowTags=Show document tags in document footer
+lacewiki.preferences.wiki.ShowSiteFeedInMenu=Show global site feed in main menu
lacewiki.preferences.userManagement.Name=Core: User Management
lacewiki.preferences.userManagement.ActivationCodeSalt=Secret salt used to generate activation codes
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/prefs/WikiPreferences.java 2008-01-22 06:46:48 UTC (rev 7176)
@@ -118,6 +118,12 @@
private Long purgeFeedEntriesAfterDays;
@PreferenceProperty(
+ description = "#{messages['lacewiki.preferences.wiki.ShowSiteFeedInMenu']}",
+ visibility = PreferenceVisibility.SYSTEM
+ )
+ private Boolean showSiteFeedInMenu;
+
+ @PreferenceProperty(
description = "#{messages['lacewiki.preferences.wiki.AtSymbolReplacement']}",
visibility = PreferenceVisibility.SYSTEM,
editorIncludeName = "AdaptiveTextInput"
@@ -212,6 +218,10 @@
return purgeFeedEntriesAfterDays;
}
+ public Boolean getShowSiteFeedInMenu() {
+ return showSiteFeedInMenu;
+ }
+
public String getAtSymbolReplacement() {
return atSymbolReplacement;
}
Modified: trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml
===================================================================
--- trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml 2008-01-22 06:46:48 UTC (rev 7176)
@@ -20,6 +20,7 @@
<PREFERENCE PREF_ID = "16" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "showTags" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
<PREFERENCE PREF_ID = "17" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "showEmailToLoggedInOnly" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
<PREFERENCE PREF_ID = "18" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "trashArea" STRING_VALUE = "Trash" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "[NULL]"/>
+ <PREFERENCE PREF_ID = "19" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "Wiki" PROPERTY_NAME = "showSiteFeedInMenu" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
<PREFERENCE PREF_ID = "20" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "minorRevisionEnabled" STRING_VALUE = "[NULL]" LONG_VALUE = "[NULL]" BOOLEAN_VALUE = "true"/>
<PREFERENCE PREF_ID = "21" OBJ_VERSION = "0" USER_ID = "[NULL]" ENTITY_NAME = "DocEditor" PROPERTY_NAME = "regularEditAreaRows" STRING_VALUE = "[NULL]" LONG_VALUE = "15" BOOLEAN_VALUE = "[NULL]"/>
Modified: trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml
===================================================================
--- trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/view/plugins/feedAggregator/plugin.xhtml 2008-01-22 06:46:48 UTC (rev 7176)
@@ -34,7 +34,7 @@
<s:span styleClass="undecoratedLink"
rendered="#{not preferences.get('FeedAggregator', currentMacro).hideAuthor}">
<h:outputText value=", #{messages['feedAggregator.label.By']} "/>
- <h:outputText styleClass="feedEntryAuthor" value="#{feDTO.feedEntry.author}"/>
+ <h:outputText styleClass="feedEntryAuthor" value="#{wiki:escapeAtSymbol(feDTO.feedEntry.author)}"/>
</s:span>
<s:span styleClass="undecoratedLink"
@@ -49,13 +49,13 @@
<s:div styleClass="feedEntryTitle undecoratedLink"
rendered="#{not preferences.get('FeedAggregator', currentMacro).hideTitle}">
<h:outputLink target="_top" value="#{feDTO.feedEntry.link}">
- <h:outputText escape="false" value="#{feDTO.feedEntry.titleStripped}"/>
+ <h:outputText escape="false" value="#{wiki:escapeAtSymbol(feDTO.feedEntry.titleStripped)}"/>
</h:outputLink>
</s:div>
<s:div styleClass="feedEntryBody" rendered="#{not preferences.get('FeedAggregator', currentMacro).hideDescription}">
<h:outputText escape="false"
- value="#{wiki:truncateStringOnWordBoundary(feDTO.feedEntry.descriptionValueStrippedNoNewlines,
+ value="#{wiki:truncateStringOnWordBoundary(wiki:escapeAtSymbol(feDTO.feedEntry.descriptionValueStrippedNoNewlines),
preferences.get('FeedAggregator', currentMacro).truncateDescription)}"/>
<h:outputLink target="_top" styleClass="feedEntryBodyMoreLink"
Modified: trunk/examples/wiki/view/themes/default/template.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/view/themes/default/template.xhtml 2008-01-22 06:46:48 UTC (rev 7176)
@@ -329,7 +329,7 @@
<ui:include src="../../includes/searchControl.xhtml"/>
</ui:define>
<ui:define name="mainMenuFooter">
- <s:div styleClass="feeds">
+ <s:div styleClass="feeds" rendered="#{preferences.get('Wiki').showSiteFeedInMenu}">
<h:outputLink value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}">
<h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/>
<span class="feedText">#{messages['lacewiki.button.SiteFeed']}</span>
Modified: trunk/examples/wiki/view/themes/sfwkorg/css/mainMenu.css
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/css/mainMenu.css 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/view/themes/sfwkorg/css/mainMenu.css 2008-01-22 06:46:48 UTC (rev 7176)
@@ -85,6 +85,7 @@
padding-top: 2px;
padding-bottom: 2px;
padding-left: 10px;
+ display: none;
}
#mainMenu .mainMenuFooter .feeds {
Modified: trunk/examples/wiki/view/themes/sfwkorg/template.xhtml
===================================================================
--- trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-22 05:30:17 UTC (rev 7175)
+++ trunk/examples/wiki/view/themes/sfwkorg/template.xhtml 2008-01-22 06:46:48 UTC (rev 7176)
@@ -309,7 +309,8 @@
<ui:define name="mainMenuHeader">
</ui:define>
<ui:define name="mainMenuFooter">
- <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" styleClass="feeds">
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0" styleClass="feeds"
+ rendered="#{preferences.get('Wiki').showSiteFeedInMenu}">
<h:outputLink styleClass="feedLink" value="#{wiki:renderFeedURL(wikiRoot.feed, null, null)}">
<h:graphicImage styleClass="feedIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.onbrown.gif" width="18" height="18"/>
</h:outputLink>
[View Less]
17 years, 1 month
Seam SVN: r7175 - in trunk/examples/seamspace: resources/WEB-INF and 2 other directories.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-22 00:30:17 -0500 (Tue, 22 Jan 2008)
New Revision: 7175
Modified:
trunk/examples/seamspace/
trunk/examples/seamspace/resources/WEB-INF/pages.xml
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
Log:
use page params instead of request params
Property changes on: trunk/examples/seamspace
…
[View More]___________________________________________________________________
Name: svn:ignore
- build
dist
exploded-archives
+ build
dist
exploded-archives
test-build
Modified: trunk/examples/seamspace/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-22 05:19:57 UTC (rev 7174)
+++ trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-22 05:30:17 UTC (rev 7175)
@@ -2,7 +2,6 @@
<pages xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
-
login-view-id="/home.xhtml">
<page view-id="/home.xhtml">
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java 2008-01-22 05:19:57 UTC (rev 7174)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/BlogAction.java 2008-01-22 05:30:17 UTC (rev 7175)
@@ -57,6 +57,8 @@
@Factory("comment") @Restrict @Begin(join = true)
public void createComment()
{
+ System.out.println("Params - blogId: " + blogId + " name: " + name);
+
comment = new BlogComment();
comment.setCommentor(authenticatedMember);
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-22 05:19:57 UTC (rev 7174)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-01-22 05:30:17 UTC (rev 7175)
@@ -4,7 +4,7 @@
import org.testng.annotations.Test;
public class BlogTest extends SeamTest
-{
+{
@Test
public void testCreateBlog() throws Exception
{
@@ -86,13 +86,18 @@
}
}.run();
- String cid = new FacesRequest()
+ String cid = new FacesRequest("/comment.xhtml")
{
@Override
+ protected void beforeRequest()
+ {
+ setPageParameter("name", "Mr_Smiley");
+ setPageParameter("blogId", "1");
+ }
+
+ @Override
protected void invokeApplication() throws Exception
{
- setParameter("name", "Mr_Smiley");
- setParameter("blogId", "1");
assert invokeAction("#{blog.createComment}") == null;
assert getValue("#{comment}") != null;
[View Less]
17 years, 1 month