Seam SVN: r7164 - trunk/examples/booking.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-21 06:45:19 -0500 (Mon, 21 Jan 2008)
New Revision: 7164
Modified:
trunk/examples/booking/
Log:
ignores
Property changes on: trunk/examples/booking
___________________________________________________________________
Name: svn:ignore
- build
test-output
+ build
test-output
dist
exploded-archives
16 years, 11 months
Seam SVN: r7163 - trunk/examples/dvdstore.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-21 06:00:08 -0500 (Mon, 21 Jan 2008)
New Revision: 7163
Added:
trunk/examples/dvdstore/pom.xml
Log:
Needed, oops
Added: trunk/examples/dvdstore/pom.xml
===================================================================
--- trunk/examples/dvdstore/pom.xml (rev 0)
+++ trunk/examples/dvdstore/pom.xml 2008-01-21 11:00:08 UTC (rev 7163)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam.examples</groupId>
+ <artifactId>jboss-seam-dvd</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+ <packaging>ear</packaging>
+
+</project>
\ No newline at end of file
Property changes on: trunk/examples/dvdstore/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 11 months
Seam SVN: r7162 - trunk/seam-gen/view.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-20 10:08:54 -0500 (Sun, 20 Jan 2008)
New Revision: 7162
Modified:
trunk/seam-gen/view/editproperty.xhtml.ftl
Log:
JBSEAM-2511
Modified: trunk/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl 2008-01-20 10:29:40 UTC (rev 7161)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl 2008-01-20 15:08:54 UTC (rev 7162)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
- <rich:calendar id=${componentProperty.name}"
+ <rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
16 years, 11 months
Seam SVN: r7161 - trunk.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-20 05:29:40 -0500 (Sun, 20 Jan 2008)
New Revision: 7161
Modified:
trunk/build.xml
Log:
Minor
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-01-20 06:57:49 UTC (rev 7160)
+++ trunk/build.xml 2008-01-20 10:29:40 UTC (rev 7161)
@@ -877,6 +877,7 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
+ <propertyref name="jbas5.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
</ant>
@@ -886,6 +887,7 @@
<target name="downloadDependenciesSources" description="Download source jars for all dependencies" depends="init">
<dependenciesWithSources id="core" scope="compile" pom="${core.pom}" />
<dependenciesWithSources id="debug" scope="compile" pom="${debug.pom}" />
+ <dependenciesWithSources id="jbas5" scope="compile" pom="${jbas5.pom}" />
<dependenciesWithSources id="gen" scope="compile" pom="${gen.pom}" />
<dependenciesWithSources id="ioc" scope="compile" pom="${ioc.pom}" />
<dependenciesWithSources id="mail" scope="compile" pom="${mail.pom}" />
@@ -913,6 +915,7 @@
classpathref="seam-gen.path"/>
<dependencies id="core" scope="compile" pom="${core.pom}" />
<dependencies id="debug" scope="compile" pom="${debug.pom}" />
+ <dependencies id="jbas5" scope="compile" pom="${jbas5.pom}" />
<dependencies id="gen" scope="compile" pom="${gen.pom}" />
<dependencies id="ioc" scope="compile" pom="${ioc.pom}" />
<dependencies id="mail" scope="compile" pom="${mail.pom}" />
16 years, 11 months
Seam SVN: r7160 - trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-20 01:57:49 -0500 (Sun, 20 Jan 2008)
New Revision: 7160
Modified:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java
Log:
JBSEAM-2453
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-01-20 06:43:40 UTC (rev 7159)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-01-20 06:57:49 UTC (rev 7160)
@@ -8,7 +8,7 @@
public class RegisterTest extends SeamTest
{
- //@Test
+ @Test
public void testRegister() throws Exception
{
String cid = new FacesRequest()
@@ -29,7 +29,7 @@
setValue("#{newMember.firstName}", "Shane");
setValue("#{newMember.lastName}", "Bryzak");
setValue("#{newMember.memberName}", "shane123");
- setValue("#{newMember.username}", "sbryzak");
+ setValue("#{register.username}", "sbryzak");
setValue("#{register.password}", "secret");
setValue("#{register.confirm}", "secret");
setValue("#{register.gender}", "Male");
16 years, 11 months
Seam SVN: r7159 - 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-20 01:43:40 -0500 (Sun, 20 Jan 2008)
New Revision: 7159
Removed:
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java
Modified:
trunk/examples/seamspace/
trunk/examples/seamspace/resources/WEB-INF/pages.xml
trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java
trunk/examples/seamspace/view/register.xhtml
Log:
JBSEAM-2495
Property changes on: trunk/examples/seamspace
___________________________________________________________________
Name: svn:ignore
+ build
dist
exploded-archives
Modified: trunk/examples/seamspace/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-20 06:41:39 UTC (rev 7158)
+++ trunk/examples/seamspace/resources/WEB-INF/pages.xml 2008-01-20 06:43:40 UTC (rev 7159)
@@ -129,11 +129,11 @@
</redirect>
</exception>
- <exception class="org.jboss.seam.security.AuthorizationException">
+ <!--exception class="org.jboss.seam.security.AuthorizationException">
<end-conversation/>
<redirect view-id="/security_error.xhtml">
<message severity="error">You do not have permission to do this</message>
</redirect>
- </exception>
+ </exception-->
</pages>
Deleted: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java 2008-01-20 06:41:39 UTC (rev 7158)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/Register.java 2008-01-20 06:43:40 UTC (rev 7159)
@@ -1,30 +0,0 @@
-package org.jboss.seam.example.seamspace;
-
-import javax.ejb.Local;
-import javax.security.auth.login.LoginException;
-
-@Local
-public interface Register
-{
- void start();
- void next();
- void uploadPicture() throws LoginException;
- String getPassword();
- void setPassword(String password);
- String getConfirm();
- void setConfirm(String confirm);
- String getGender();
- void setGender(String gender);
-
- byte[] getPicture();
- void setPicture(byte[] picture);
-
- String getPictureContentType();
- void setPictureContentType(String contentType);
-
- boolean isVerified();
-
- void accountCreated(MemberAccount account);
-
- void destroy();
-}
Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java
===================================================================
--- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-01-20 06:41:39 UTC (rev 7158)
+++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/RegisterAction.java 2008-01-20 06:43:40 UTC (rev 7159)
@@ -1,9 +1,10 @@
package org.jboss.seam.example.seamspace;
+import static org.jboss.seam.ScopeType.CONVERSATION;
+
import java.util.Date;
import javax.ejb.Remove;
-import javax.ejb.Stateful;
import javax.persistence.EntityManager;
import org.jboss.seam.annotations.Begin;
@@ -14,14 +15,16 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Observer;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Scope;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Identity;
+import org.jboss.seam.security.RunAsOperation;
import org.jboss.seam.security.management.IdentityManager;
import org.jboss.seam.security.management.JpaIdentityStore;
-@Stateful
+@Scope(CONVERSATION)
@Name("register")
-public class RegisterAction implements Register
+public class RegisterAction
{
@In(required = false) @Out
private Member newMember;
@@ -95,13 +98,22 @@
@End
public void uploadPicture()
- {
- identityManager.createAccount(username, password);
- identityManager.grantRole(username, "user");
-
+ {
newMember.setMemberSince(new Date());
- entityManager.persist(newMember);
+ entityManager.persist(newMember);
+ new RunAsOperation() {
+ @Override
+ public String[] getRoles() {
+ return new String[] { "admin" };
+ }
+
+ public void execute() {
+ identityManager.createAccount(username, password);
+ identityManager.grantRole(username, "user");
+ }
+ }.run();
+
newAccount.setMember(newMember);
newAccount = entityManager.merge(newAccount);
Modified: trunk/examples/seamspace/view/register.xhtml
===================================================================
--- trunk/examples/seamspace/view/register.xhtml 2008-01-20 06:41:39 UTC (rev 7158)
+++ trunk/examples/seamspace/view/register.xhtml 2008-01-20 06:43:40 UTC (rev 7159)
@@ -48,7 +48,7 @@
<div class="formRow">
<h:outputLabel for="username">Username<em>*</em></h:outputLabel>
- <h:inputText id="username" value="#{newMember.username}" required="true"/>
+ <h:inputText id="username" value="#{register.username}" required="true"/>
<div class="validationError"><h:message for="username"/></div>
</div>
16 years, 11 months
Seam SVN: r7158 - trunk/src/main/org/jboss/seam/security.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-20 01:41:39 -0500 (Sun, 20 Jan 2008)
New Revision: 7158
Added:
trunk/src/main/org/jboss/seam/security/RunAsOperation.java
Modified:
trunk/src/main/org/jboss/seam/security/Identity.java
trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java
Log:
JBSEAM-737
Modified: trunk/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Identity.java 2008-01-19 22:52:43 UTC (rev 7157)
+++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-01-20 06:41:39 UTC (rev 7158)
@@ -608,6 +608,25 @@
{
this.jaasConfigName = jaasConfigName;
}
+
+ synchronized void runAs(RunAsOperation operation)
+ {
+ Principal savedPrincipal = getPrincipal();
+ Subject savedSubject = getSubject();
+
+ try
+ {
+ principal = operation.getPrincipal();
+ subject = operation.getSubject();
+
+ operation.execute();
+ }
+ finally
+ {
+ principal = savedPrincipal;
+ subject = savedSubject;
+ }
+ }
public void checkEntityPermission(Object entity, EntityAction action)
{
Modified: trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-01-19 22:52:43 UTC (rev 7157)
+++ trunk/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-01-20 06:41:39 UTC (rev 7158)
@@ -11,6 +11,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.security.auth.Subject;
+
import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.StatefulSession;
@@ -118,6 +120,8 @@
if (securityContext == null) return false;
+ synchronizeContext();
+
List<FactHandle> handles = new ArrayList<FactHandle>();
PermissionCheck check = new PermissionCheck(name, action);
@@ -196,18 +200,12 @@
@Override
public boolean addRole(String role)
{
- if (super.addRole(role))
+ if (super.addRole(role))
{
- StatefulSession securityContext = getSecurityContext();
-
- if (securityContext != null)
- {
- getSecurityContext().insert(new Role(role));
- getSecurityContext().fireAllRules();
- return true;
- }
+ synchronizeContext();
+ return true;
}
-
+
return false;
}
@@ -215,24 +213,56 @@
@Override
public void removeRole(String role)
{
- StatefulSession securityContext = getSecurityContext();
-
- if (securityContext != null)
+ super.removeRole(role);
+ synchronizeContext();
+ }
+
+ /**
+ * Synchronizes the state of the security context with that of the subject
+ */
+ private void synchronizeContext()
+ {
+ for ( Group sg : getSubject().getPrincipals(Group.class) )
{
- Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class));
- while (iter.hasNext())
+ if ( ROLES_GROUP.equals( sg.getName() ) )
{
- Role r = iter.next();
- if (r.getName().equals(role))
+ Enumeration e = sg.members();
+ while (e.hasMoreElements())
{
- FactHandle fh = getSecurityContext().getFactHandle(r);
- getSecurityContext().retract(fh);
- break;
+ Principal role = (Principal) e.nextElement();
+
+ boolean found = false;
+ Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class));
+ while (iter.hasNext())
+ {
+ Role r = iter.next();
+ if (r.getName().equals(role.getName()))
+ {
+ FactHandle fh = getSecurityContext().getFactHandle(r);
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ getSecurityContext().insert(new Role(role.getName()));
+ }
+
}
}
+ }
+
+ Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class));
+ while (iter.hasNext())
+ {
+ Role r = iter.next();
+ if (!super.hasRole(r.getName()))
+ {
+ FactHandle fh = getSecurityContext().getFactHandle(r);
+ getSecurityContext().retract(fh);
+ }
}
-
- super.removeRole(role);
}
Added: trunk/src/main/org/jboss/seam/security/RunAsOperation.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/RunAsOperation.java (rev 0)
+++ trunk/src/main/org/jboss/seam/security/RunAsOperation.java 2008-01-20 06:41:39 UTC (rev 7158)
@@ -0,0 +1,72 @@
+package org.jboss.seam.security;
+
+import java.security.Principal;
+import java.security.acl.Group;
+
+import javax.security.auth.Subject;
+
+/**
+ * Defines a security operation that can be executed within a particular
+ * security context.
+ *
+ * @author Shane Bryzak
+ */
+public abstract class RunAsOperation
+{
+ private Principal principal;
+ private Subject subject;
+
+ public RunAsOperation()
+ {
+ principal = new SimplePrincipal(null);
+ subject = new Subject();
+ }
+
+ public abstract void execute();
+
+ public Principal getPrincipal()
+ {
+ return principal;
+ }
+
+ public Subject getSubject()
+ {
+ return subject;
+ }
+
+ public String[] getRoles()
+ {
+ return null;
+ }
+
+ private boolean addRole(String role)
+ {
+ for ( Group sg : getSubject().getPrincipals(Group.class) )
+ {
+ if ( Identity.ROLES_GROUP.equals( sg.getName() ) )
+ {
+ return sg.addMember(new SimplePrincipal(role));
+ }
+ }
+
+ SimpleGroup roleGroup = new SimpleGroup(Identity.ROLES_GROUP);
+ roleGroup.addMember(new SimplePrincipal(role));
+ getSubject().getPrincipals().add(roleGroup);
+
+ return true;
+ }
+
+ public void run()
+ {
+ String[] roles = getRoles();
+ if (roles != null)
+ {
+ for (String role : getRoles())
+ {
+ addRole(role);
+ }
+ }
+
+ Identity.instance().runAs(this);
+ }
+}
16 years, 11 months
Seam SVN: r7157 - in trunk: build and 1 other directories.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-19 17:52:43 -0500 (Sat, 19 Jan 2008)
New Revision: 7157
Added:
trunk/build/jbas5.pom.xml
trunk/src/jbas5/
Modified:
trunk/build.xml
trunk/build/ci.build.xml
trunk/build/classpath.tmpl
trunk/build/common.build.xml
Log:
Add jbas5 module for JBoss AS5 integration code
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-01-19 22:24:19 UTC (rev 7156)
+++ trunk/build/ci.build.xml 2008-01-19 22:52:43 UTC (rev 7157)
@@ -20,6 +20,7 @@
<deploySnapshotPom pom="${parent.pom}" />
<deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" />
<deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/>
+ <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/jboss-seam-jbas5.jar" srcjar="${lib.dir}/src/jboss-seam-jbas5-sources.jar"/>
<deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar"/>
<deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar"/>
<deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/>
Modified: trunk/build/classpath.tmpl
===================================================================
(Binary files differ)
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-01-19 22:24:19 UTC (rev 7156)
+++ trunk/build/common.build.xml 2008-01-19 22:52:43 UTC (rev 7157)
@@ -95,6 +95,7 @@
<install pom="${parent.pom}" />
<pomfile name="core.pom" value="${build.dir}/core.pom.xml" />
<pomfile name="debug.pom" value="${build.dir}/debug.pom.xml" />
+ <pomfile name="jbas5.pom" value="${build.dir}/jbas5.pom.xml" />
<pomfile name="gen.pom" value="${build.dir}/gen.pom.xml" />
<pomfile name="ioc.pom" value="${build.dir}/ioc.pom.xml" />
<pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" />
@@ -108,6 +109,7 @@
<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
+ <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
@@ -115,6 +117,7 @@
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
+ <copyDependencies id="jbas5" pom="${jbas5.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
@@ -127,6 +130,7 @@
<artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-jbas5" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
@@ -196,6 +200,7 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
+ <propertyref name="jbas5.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
</ant>
@@ -229,6 +234,7 @@
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
+ <propertyref name="jbas5.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
</ant>
Added: trunk/build/jbas5.pom.xml
===================================================================
--- trunk/build/jbas5.pom.xml (rev 0)
+++ trunk/build/jbas5.pom.xml 2008-01-19 22:52:43 UTC (rev 7157)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jbas5</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+ <description>Seam integration with JBoss AS 5</description>
+
+ <!-- See parent pom for notes on how to declare dependencies -->
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
Property changes on: trunk/build/jbas5.pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-01-19 22:24:19 UTC (rev 7156)
+++ trunk/build.xml 2008-01-19 22:52:43 UTC (rev 7157)
@@ -18,6 +18,7 @@
<property name="classes.ioc.dir" value="${classes.dir}/iocclasses" />
<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
<property name="classes.debug.dir" value="${classes.dir}/debugclasses" />
+ <property name="classes.jbas5.dir" value="${classes.dir}/jbas5classes" />
<property name="classes.remoting.dir" value="${classes.dir}/remotingclasses" />
<property name="classes.gen.dir" value="${classes.dir}/genclasses" />
<property name="classes.test.dir" value="${classes.dir}/testclasses" />
@@ -32,6 +33,7 @@
<property name="src.ioc.dir" value="src/ioc" />
<property name="src.mail.dir" value="src/mail" />
<property name="src.debug.dir" value="src/debug" />
+ <property name="src.jbas5.dir" value="src/jbas5" />
<property name="src.gen.dir" value="src/gen" />
<property name="src.remoting.dir" value="src/remoting" />
<property name="src.test.dir" value="src/test" />
@@ -62,6 +64,7 @@
<property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" />
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
<property name="dist.src.debug.dir" value="${dist.dir}/src/debug" />
+ <property name="dist.src.jbas5.dir" value="${dist.dir}/src/jbas5" />
<property name="dist.src.gen.dir" value="${dist.dir}/src/gen" />
<property name="dist.src.remoting.dir" value="${dist.dir}/src/remoting" />
<property name="dist.src.test.dir" value="${dist.dir}/src/test" />
@@ -150,7 +153,7 @@
<delete dir="${lib.dir}" quiet="${quietclean}" />
</target>
- <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui" description="Build all four distribution .jar files" />
+ <target name="build" depends="jarcore,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarjbas5" description="Build all distribution .jar files" />
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -239,8 +242,21 @@
<target name="jardebug" depends="compiledebug" description="Build the distribution .jar file for the Debug package">
<archive classesdir="${classes.debug.dir}" module="jboss-seam-debug" pom="${debug.pom}" srcdir="${src.debug.dir}"/>
</target>
+
+ <!-- ########################### JBAS5 TARGETS ###########################-->
+ <target name="initjbas5" depends="init, jarcore">
+ <init classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" modulename="jbas5" pom="${jbas5.pom}" />
+ </target>
+ <target name="compilejbas5" depends="initjbas5, select-compiler">
+ <compile classesdir="${classes.jbas5.dir}" srcdir="${src.jbas5.dir}" classpath="compile.jbas5.path" />
+ </target>
+
+ <target name="jarjbas5" depends="compilejbas5" description="Build the distribution .jar file for the JBAS5 integration package">
+ <archive classesdir="${classes.jbas5.dir}" module="jboss-seam-jbas5" pom="${jbas5.pom}" srcdir="${src.jbas5.dir}"/>
+ </target>
+
<!-- ########################### GEN TARGETS ###########################-->
<target name="initgen" depends="init">
16 years, 11 months
Seam SVN: r7156 - trunk/examples/dvdstore.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-01-19 17:24:19 -0500 (Sat, 19 Jan 2008)
New Revision: 7156
Removed:
trunk/examples/dvdstore/pom.xml
Log:
Tidy up
Deleted: trunk/examples/dvdstore/pom.xml
===================================================================
--- trunk/examples/dvdstore/pom.xml 2008-01-19 09:04:02 UTC (rev 7155)
+++ trunk/examples/dvdstore/pom.xml 2008-01-19 22:24:19 UTC (rev 7156)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.examples</groupId>
- <artifactId>jboss-seam-dvd</artifactId>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>parent</artifactId>
- <version>@seam.version@</version>
- </parent>
- <packaging>ear</packaging>
-
-</project>
\ No newline at end of file
16 years, 11 months
Seam SVN: r7155 - trunk/examples/wiki.
by seam-commits@lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-01-19 04:04:02 -0500 (Sat, 19 Jan 2008)
New Revision: 7155
Modified:
trunk/examples/wiki/Wiki.iws
Log:
Update IntelliJ, better headline rendering, minor fixes to FAQ plugin
Modified: trunk/examples/wiki/Wiki.iws
===================================================================
--- trunk/examples/wiki/Wiki.iws 2008-01-19 08:54:44 UTC (rev 7154)
+++ trunk/examples/wiki/Wiki.iws 2008-01-19 09:04:02 UTC (rev 7155)
@@ -34,19 +34,7 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iws" afterPath="$PROJECT_DIR$/Wiki.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/WikiFormattedTextHandler.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml" afterPath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/HelpDocuments.dbunit.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml" afterPath="$PROJECT_DIR$/view/plugins/faqBrowser/faqControls.xhtml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.ipr" afterPath="$PROJECT_DIR$/Wiki.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties" afterPath="$PROJECT_DIR$/src/etc/messages_faqBrowser_en.properties" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css" afterPath="$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Wiki.iml" afterPath="$PROJECT_DIR$/Wiki.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/docDisplay_d.xhtml" afterPath="$PROJECT_DIR$/view/docDisplay_d.xhtml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml" afterPath="$PROJECT_DIR$/src/test/org/jboss/seam/wiki/test/WikiBaseData.dbunit.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/view/themes/default/css/template.css" afterPath="$PROJECT_DIR$/view/themes/default/css/template.css" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" afterPath="$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/faqBrowser/FaqBrowser.java" />
</list>
<list name="Failed commit: Default" comment="Oops" />
<list name="Foo" comment="" />
@@ -574,7 +562,7 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames />
- <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
+ <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource ProjectPane="false" />
<sortByType />
@@ -669,17 +657,17 @@
</key>
</component>
<component name="RunManager" selected="TestNG.AllTests">
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$PROJECT_DIR$/../../../../../../../Desktop/IntelliJ IDEA.app/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
+ <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="true" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER_URL" value="/" />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
+ <option name="BASE_DIRECTORY_NAME" value="" />
+ <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
@@ -693,35 +681,52 @@
<option name="BASE_DIRECTORY_NAME" value="" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <option name="PROPERTIES_FILE" />
<envs />
+ <properties>
+ <property name="binaryDir" value="META-INF/testbinaries" />
+ <property name="database" value="hsql" />
+ <property name="datasourceJndiName" value="java:/wikiTestDatasource" />
+ </properties>
+ <listeners />
<method>
<option name="Make" value="true" />
+ <option name="Run ant target" value="false" />
</method>
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$PROJECT_DIR$/../../../../../../../Desktop/IntelliJ IDEA.app/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -738,45 +743,33 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
- <option name="BASE_DIRECTORY_NAME" value="" />
- <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
+ <option name="PORT" value="5005" />
</configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
+ <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" />
- <option name="OUTPUT_DIRECTORY" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <option name="PROPERTIES_FILE" />
- <properties>
- <property name="binaryDir" value="META-INF/testbinaries" />
- <property name="database" value="hsql" />
- <property name="datasourceJndiName" value="java:/wikiTestDatasource" />
- </properties>
+ <envs />
<method>
<option name="Make" value="true" />
- <option name="Run ant target" value="false" />
</method>
</configuration>
<configuration default="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false">
@@ -853,16 +846,21 @@
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/build/test-output" />
+ <option name="ANNOTATION_TYPE" value="JDK" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
+ <value defaultName="moduleWithDependencies" />
</option>
<option name="PROPERTIES_FILE" value="" />
+ <envs />
<properties>
<property name="binaryDir" value="META-INF/testbinaries" />
<property name="database" value="hsql" />
<property name="datasourceJndiName" value="java:/wikiTestDatasource" />
</properties>
+ <listeners />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="55160" />
<option name="TRANSPORT" value="0" />
@@ -872,6 +870,7 @@
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
+ <option name="Run Ant target" value="true" />
<option name="Make" value="false" />
<option name="Run ant target" value="true" />
</method>
@@ -890,16 +889,21 @@
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/build/test-output" />
+ <option name="ANNOTATION_TYPE" value="JDK" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
+ <value defaultName="moduleWithDependencies" />
</option>
<option name="PROPERTIES_FILE" value="" />
+ <envs />
<properties>
<property name="binaryDir" value="META-INF/testbinaries" />
<property name="database" value="hsql" />
<property name="datasourceJndiName" value="java:/wikiTestDatasource" />
</properties>
+ <listeners />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="55956" />
<option name="TRANSPORT" value="0" />
@@ -909,6 +913,7 @@
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method>
+ <option name="Run Ant target" value="true" />
<option name="Make" value="false" />
<option name="Run ant target" value="true" />
</method>
@@ -1070,7 +1075,7 @@
<layout>
<window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46458924" order="16" x="11" y="253" width="1391" height="477" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.64235127" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18789808" order="0" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18630573" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6175637" order="1" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16162421" order="8" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2868272" order="12" x="24" y="688" width="925" height="442" />
@@ -1078,10 +1083,10 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32961783" order="7" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39486468" order="13" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12420382" order="2" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.125" order="2" />
<window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32945424" order="4" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293201" order="14" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4663428" order="2" x="-1442" y="805" width="1440" height="900" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46600565" order="2" x="-1442" y="805" width="1440" height="900" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24930307" order="1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6363636" order="3" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2109646" order="11" />
@@ -1115,7 +1120,7 @@
<option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Stupid bug" />
+ <option name="LAST_COMMIT_MESSAGE" value="Update IntelliJ, better headline rendering, minor fixes to FAQ plugin" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
@@ -1126,7 +1131,6 @@
<option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- <MESSAGE value="Forum queries performance optimization" />
<MESSAGE value="Disable tests that fail on HSQL DB" />
<MESSAGE value="Dev profile now requires MySQL, disabled tests conditionally that don't run on HSQL" />
<MESSAGE value="Minor improvements to forum browsing and doc pager" />
@@ -1151,6 +1155,7 @@
<MESSAGE value="Fixes for faq browser" />
<MESSAGE value="Updated IntelliJ project to subversion" />
<MESSAGE value="Stupid bug" />
+ <MESSAGE value="Update IntelliJ, better headline rendering, minor fixes to FAQ plugin" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1237,13 +1242,6 @@
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/view/plugins/faqBrowser/plugin.xhtml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="13" selection-start="48" selection-end="48" vertical-scroll-proportion="0.009461426">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/view/includes/wikiTextPreview.xhtml">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="28" selection-start="458" selection-end="458" vertical-scroll-proportion="0.09461427">
@@ -1303,28 +1301,7 @@
<entry file="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/core/engine/DefaultWikiTextRenderer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="115" column="0" selection-start="3399" selection-end="3399" vertical-scroll-proportion="0.9236417">
- <folding>
- <marker date="1200731089000" expanded="true" signature="329:360" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="422:677" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="739:912" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1004:1042" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1102:1144" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1193:1226" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1408:1458" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1506:1566" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1612:1677" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1730:1914" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="1967:2151" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="2204:2388" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="2441:2625" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="2673:2731" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="2782:2842" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="2891:2951" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="3004:3066" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="3110:3162" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="3207:3237" placeholder="{...}" />
- <marker date="1200731089000" expanded="true" signature="3303:3329" placeholder="{...}" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
@@ -1349,27 +1326,34 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/docDisplay_d.xhtml">
+ <entry file="file://$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="4516" selection-end="4516" vertical-scroll-proportion="0.6015152">
+ <state line="72" column="17" selection-start="1083" selection-end="1083" vertical-scroll-proportion="0.49588633">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/themes/sfwkorg/css/sfwk.css">
+ <entry file="file://$PROJECT_DIR$/view/themes/default/css/template.css">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="17" selection-start="1083" selection-end="1083" vertical-scroll-proportion="0.49588633">
+ <state line="360" column="24" selection-start="5641" selection-end="5641" vertical-scroll-proportion="0.2303665">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/view/themes/default/css/template.css">
+ <entry file="file://$PROJECT_DIR$/view/docEdit_d.xhtml">
<provider selected="true" editor-type-id="text-editor">
- <state line="360" column="24" selection-start="5641" selection-end="5641" vertical-scroll-proportion="0.2303665">
+ <state line="307" column="9" selection-start="19645" selection-end="19645" vertical-scroll-proportion="0.03322615">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/view/docDisplay_d.xhtml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="99" column="0" selection-start="4397" selection-end="4771" vertical-scroll-proportion="0.013933548">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="testng.defaultConfiguration">
<outputDirectory />
16 years, 11 months