gatein SVN: r283 - in components/mop/trunk: api/src/main/java/org/gatein/mop/api/content and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-05 11:39:14 -0400 (Mon, 05 Oct 2009)
New Revision: 283
Modified:
components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java
components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
Log:
update to chromattic 1.0.O-beta4
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java 2009-10-05 15:34:01 UTC (rev 282)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/Model.java 2009-10-05 15:39:14 UTC (rev 283)
@@ -21,6 +21,7 @@
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.WorkspaceObject;
import org.gatein.mop.api.workspace.ObjectType;
+import org.gatein.mop.api.content.Customization;
import java.util.Iterator;
@@ -55,6 +56,8 @@
String pathOf(WorkspaceObject o);
+ Customization<?> findCustomizationById(String id);
+
void save();
void close();
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-10-05 15:34:01 UTC (rev 282)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/content/Customization.java 2009-10-05 15:39:14 UTC (rev 283)
@@ -31,6 +31,13 @@
public interface Customization<S> {
/**
+ * Returns the customization id
+ *
+ * @return the customization id
+ */
+ String getId();
+
+ /**
* Returns the content id this customization refers to.
*
* @return the content id
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-10-05 15:34:01 UTC (rev 282)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-10-05 15:39:14 UTC (rev 283)
@@ -40,6 +40,7 @@
import org.gatein.mop.core.api.workspace.content.ContextSpecialization;
import org.gatein.mop.core.api.workspace.content.AbstractCustomization;
import org.gatein.mop.api.content.CustomizationContext;
+import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.WorkspaceObject;
@@ -140,16 +141,20 @@
public void created(Object o) {
inject(o, false);
}
- public void loaded(Object o) {
+ public void loaded(String id, String path, String name, Object o) {
inject(o, true);
}
- public void persisted(Object o) {
+ public void added(String id, String path, String name, Object o) {
inject(o, true);
}
- public void removed(Object o) {
+ public void removed(String id, String path, String name, Object o) {
}
};
+ public Customization<?> findCustomizationById(String id) {
+ return session.findById(Customization.class, id);
+ }
+
public <O extends WorkspaceObject> Iterator<O> findObject(ObjectType<O> type, String statement) {
Class<? extends WorkspaceObjectImpl> impl = typeToClassImpl.get(type);
return session.createQueryBuilder().from(impl).<O>where(statement).get().iterator();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2009-10-05 15:34:01 UTC (rev 282)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2009-10-05 15:39:14 UTC (rev 283)
@@ -29,6 +29,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.Id;
import org.chromattic.api.ChromatticSession;
import java.util.Set;
@@ -63,6 +64,9 @@
/** . */
public ChromatticSession session;
+ @Id
+ public abstract String getId();
+
@OneToOne
@MappedBy("contexttypes")
abstract ContextTypeContainer getContextTypes();
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-10-05 15:34:01 UTC (rev 282)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-10-05 15:39:14 UTC (rev 283)
@@ -208,7 +208,7 @@
public void testComponentOrder() {
ModelImpl pom = pomService.getModel();
Workspace workspace = pom.getWorkspace();
- Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
+ Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal2");
Page root = portal.getRootPage();
UIContainer container = root.getRootComponent();
15 years, 3 months
gatein SVN: r282 - tools/maven/dep/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-05 11:34:01 -0400 (Mon, 05 Oct 2009)
New Revision: 282
Modified:
tools/maven/dep/trunk/pom.xml
Log:
updating for chromattic 1.0.0-beta4
Modified: tools/maven/dep/trunk/pom.xml
===================================================================
--- tools/maven/dep/trunk/pom.xml 2009-10-05 11:34:32 UTC (rev 281)
+++ tools/maven/dep/trunk/pom.xml 2009-10-05 15:34:01 UTC (rev 282)
@@ -28,7 +28,7 @@
<properties>
<!-- Dependencies versions -->
<version.activation>1.1</version.activation>
- <version.chromattic>1.0.0-beta3</version.chromattic>
+ <version.chromattic>1.0.0-beta4</version.chromattic>
<version.log4j>1.2.14</version.log4j>
<version.junit>3.8.2</version.junit>
<version.javax.servlet>2.5</version.javax.servlet>
15 years, 3 months
gatein SVN: r281 - components/pc/trunk/docs/user-guide.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-05 07:34:32 -0400 (Mon, 05 Oct 2009)
New Revision: 281
Modified:
components/pc/trunk/docs/user-guide/pom.xml
Log:
Using doc 1.0.0-CR1
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2009-10-05 11:18:20 UTC (rev 280)
+++ components/pc/trunk/docs/user-guide/pom.xml 2009-10-05 11:34:32 UTC (rev 281)
@@ -5,9 +5,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>documentation</artifactId>
- <version>1.0</version>
+ <groupId>org.gatein.doc</groupId>
+ <artifactId>doc-parent</artifactId>
+ <version>1.0.0-CR1</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
15 years, 3 months
gatein SVN: r280 - tools/maven/doc-parent/tags/1.0.0-CR1.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-05 07:18:20 -0400 (Mon, 05 Oct 2009)
New Revision: 280
Modified:
tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml
Log:
Adding distribution management repositories
Modified: tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml
===================================================================
--- tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml 2009-10-05 11:03:14 UTC (rev 279)
+++ tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml 2009-10-05 11:18:20 UTC (rev 280)
@@ -82,4 +82,19 @@
<translation>en-US</translation>
</properties>
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>
15 years, 3 months
gatein SVN: r278 - in tools/maven/doc-parent/tags: 1.0.0-CR1 and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-05 07:03:04 -0400 (Mon, 05 Oct 2009)
New Revision: 278
Added:
tools/maven/doc-parent/tags/1.0.0-CR1/
tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml
Removed:
tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml
Log:
[maven-release-plugin] copy for tag 1.0.0-CR1
Copied: tools/maven/doc-parent/tags/1.0.0-CR1 (from rev 275, tools/maven/doc-parent/trunk)
Deleted: tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml
===================================================================
--- tools/maven/doc-parent/trunk/pom.xml 2009-10-05 10:57:47 UTC (rev 275)
+++ tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml 2009-10-05 11:03:04 UTC (rev 278)
@@ -1,86 +0,0 @@
-<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.gatein.doc</groupId>
- <artifactId>doc-parent</artifactId>
- <packaging>pom</packaging>
- <name>GateIn Doc - Doc Parent POM</name>
- <version>1.0.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/doc-parent/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/doc-parent/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/tools/maven/doc-parent/trunk/</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.1</version>
- <extensions>true</extensions>
- <dependencies>
- <dependency>
- <groupId>org.gatein.doc</groupId>
- <artifactId>gatein-docbook-xslt</artifactId>
- <version>1.0.0-CR1</version>
- </dependency>
- <dependency>
- <groupId>org.gatein.doc</groupId>
- <artifactId>gatein-jdocbook-style</artifactId>
- <version>1.0.0-CR1</version>
- <type>jdocbook-style</type>
- </dependency>
- </dependencies>
- <configuration>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${pom.basedir}/en</sourceDirectory>
- <imageResource>
- <directory>${pom.basedir}/en</directory>
- <includes>
- <include>images/**/*</include>
- </includes>
- </imageResource>
- <!--<cssResource>
- <directory>src/main/css</directory>
- </cssResource>-->
- <formats>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath://xslt/org/gatein/pdf.xsl</stylesheetResource>
- <finalName>${pom.name}.pdf</finalName>
- </format>
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/gatein/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/gatein/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>eclipse</formatName>
- <stylesheetResource>classpath:/xslt/org/gatein/eclipse.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- <xmlTransformerType>saxon</xmlTransformerType>
- <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
- <!-- could also locate the docbook dependency and inspect its version... -->
- <docbookVersion>1.74.0</docbookVersion>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <translation>en-US</translation>
- </properties>
-
-</project>
Copied: tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml (from rev 277, tools/maven/doc-parent/trunk/pom.xml)
===================================================================
--- tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml (rev 0)
+++ tools/maven/doc-parent/tags/1.0.0-CR1/pom.xml 2009-10-05 11:03:04 UTC (rev 278)
@@ -0,0 +1,85 @@
+<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.gatein.doc</groupId>
+ <artifactId>doc-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>GateIn Doc - Doc Parent POM</name>
+ <version>1.0.0-CR1</version>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/tools/maven/doc-parent/tags...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/tools/maven/doc-parent/tags/1....</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/tools/maven/doc-parent/tags/1.0.0-CR1</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>2.1.1</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.doc</groupId>
+ <artifactId>gatein-docbook-xslt</artifactId>
+ <version>1.0.0-CR1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.doc</groupId>
+ <artifactId>gatein-jdocbook-style</artifactId>
+ <version>1.0.0-CR1</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <sourceDirectory>${pom.basedir}/en</sourceDirectory>
+ <imageResource>
+ <directory>${pom.basedir}/en</directory>
+ <includes>
+ <include>images/**/*</include>
+ </includes>
+ </imageResource>
+ <!--<cssResource>
+ <directory>src/main/css</directory>
+ </cssResource>-->
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath://xslt/org/gatein/pdf.xsl</stylesheetResource>
+ <finalName>${pom.name}.pdf</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>eclipse</formatName>
+ <stylesheetResource>classpath:/xslt/org/gatein/eclipse.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
+ <!-- could also locate the docbook dependency and inspect its version... -->
+ <docbookVersion>1.74.0</docbookVersion>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <translation>en-US</translation>
+ </properties>
+
+</project>
15 years, 3 months
gatein SVN: r276 - in components/mop/trunk/core/src/main: resources/conf/standalone and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-05 07:01:45 -0400 (Mon, 05 Oct 2009)
New Revision: 276
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetContentProvider.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetState.java
components/mop/trunk/core/src/main/resources/conf/standalone/nodetypes.xml
Log:
fix minor bug in gadget state handling
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetContentProvider.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetContentProvider.java 2009-10-05 10:57:47 UTC (rev 275)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetContentProvider.java 2009-10-05 11:01:45 UTC (rev 276)
@@ -60,7 +60,7 @@
if (state == null) {
return;
} else {
- Node stateNode = node.addNode("state", "mop:portletpreferences");
+ Node stateNode = node.addNode("state", "mop:gadget");
prefs = (GadgetState)session.findById(Object.class, stateNode.getUUID());
}
}
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetState.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetState.java 2009-10-05 10:57:47 UTC (rev 275)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/content/gadget/GadgetState.java 2009-10-05 11:01:45 UTC (rev 276)
@@ -26,7 +26,7 @@
@NodeMapping(name = "mop:gadget")
public abstract class GadgetState {
- @Property(name = "userprefs")
+ @Property(name = "prefs")
public abstract String getUserPrefs();
public abstract void setUserPrefs(String userPrefs);
Modified: components/mop/trunk/core/src/main/resources/conf/standalone/nodetypes.xml
===================================================================
--- components/mop/trunk/core/src/main/resources/conf/standalone/nodetypes.xml 2009-10-05 10:57:47 UTC (rev 275)
+++ components/mop/trunk/core/src/main/resources/conf/standalone/nodetypes.xml 2009-10-05 11:01:45 UTC (rev 276)
@@ -56,6 +56,17 @@
</propertyDefinitions>
</nodeType>
+ <nodeType name="mop:gadget" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>mop:customizationstate</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
<nodeType name="mop:contexttypecontainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
15 years, 3 months
gatein SVN: r275 - tools/maven/doc-parent/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-05 06:57:47 -0400 (Mon, 05 Oct 2009)
New Revision: 275
Modified:
tools/maven/doc-parent/trunk/pom.xml
Log:
Useing doc-style 1.0.0-CR1
Modified: tools/maven/doc-parent/trunk/pom.xml
===================================================================
--- tools/maven/doc-parent/trunk/pom.xml 2009-10-05 10:49:00 UTC (rev 274)
+++ tools/maven/doc-parent/trunk/pom.xml 2009-10-05 10:57:47 UTC (rev 275)
@@ -24,12 +24,12 @@
<dependency>
<groupId>org.gatein.doc</groupId>
<artifactId>gatein-docbook-xslt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR1</version>
</dependency>
<dependency>
<groupId>org.gatein.doc</groupId>
<artifactId>gatein-jdocbook-style</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-CR1</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
15 years, 3 months