exo-jcr SVN: r2982 - in ws/trunk/exo.ws.frameworks.json: src/test/java/org/exoplatform/ws/frameworks/json/impl and 2 other directories.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2010-08-25 01:21:03 -0400 (Wed, 25 Aug 2010)
New Revision: 2982
Added:
ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/
ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/GroovyBeanTest.java
ws/trunk/exo.ws.frameworks.json/src/test/resources/BookBean.groovy
ws/trunk/exo.ws.frameworks.json/src/test/resources/BookStorage.groovy
ws/trunk/exo.ws.frameworks.json/src/test/resources/SimpleBean.groovy
Modified:
ws/trunk/exo.ws.frameworks.json/pom.xml
ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorTest.java
ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonParserTest.java
Log:
EXOJCR-890 : add TestCase
Modified: ws/trunk/exo.ws.frameworks.json/pom.xml
===================================================================
--- ws/trunk/exo.ws.frameworks.json/pom.xml 2010-08-24 07:18:30 UTC (rev 2981)
+++ ws/trunk/exo.ws.frameworks.json/pom.xml 2010-08-25 05:21:03 UTC (rev 2982)
@@ -39,6 +39,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -48,6 +53,7 @@
<includes>
<include>**/*.json</include>
<include>**/*.txt</include>
+ <include>**/*.groovy</include>
</includes>
</testResource>
</testResources>
Modified: ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorTest.java
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorTest.java 2010-08-24 07:18:30 UTC (rev 2981)
+++ ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorTest.java 2010-08-25 05:21:03 UTC (rev 2982)
@@ -30,7 +30,6 @@
import org.exoplatform.ws.frameworks.json.JavaMapBean;
import org.exoplatform.ws.frameworks.json.StringEnum;
import org.exoplatform.ws.frameworks.json.value.JsonValue;
-import org.exoplatform.ws.frameworks.json.value.impl.ArrayValue;
import java.util.ArrayList;
import java.util.Arrays;
Modified: ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonParserTest.java
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonParserTest.java 2010-08-24 07:18:30 UTC (rev 2981)
+++ ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/JsonParserTest.java 2010-08-25 05:21:03 UTC (rev 2982)
@@ -31,7 +31,6 @@
import org.exoplatform.ws.frameworks.json.JsonParser;
import org.exoplatform.ws.frameworks.json.StringEnum;
import org.exoplatform.ws.frameworks.json.value.JsonValue;
-import org.exoplatform.ws.frameworks.json.value.impl.ArrayValue;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
Added: ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/GroovyBeanTest.java
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/GroovyBeanTest.java (rev 0)
+++ ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/GroovyBeanTest.java 2010-08-25 05:21:03 UTC (rev 2982)
@@ -0,0 +1,83 @@
+package org.exoplatform.ws.frameworks.json.impl.groovy;
+
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyObject;
+import junit.framework.TestCase;
+
+import org.exoplatform.ws.frameworks.json.JsonHandler;
+import org.exoplatform.ws.frameworks.json.impl.BeanBuilder;
+import org.exoplatform.ws.frameworks.json.impl.JsonDefaultHandler;
+import org.exoplatform.ws.frameworks.json.impl.JsonGeneratorImpl;
+import org.exoplatform.ws.frameworks.json.impl.JsonParserImpl;
+import org.exoplatform.ws.frameworks.json.value.JsonValue;
+import org.exoplatform.ws.frameworks.json.value.impl.ObjectValue;
+import org.exoplatform.ws.frameworks.json.value.impl.StringValue;
+
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.List;
+
+public class GroovyBeanTest extends TestCase
+{
+
+ @SuppressWarnings("unchecked")
+ public void testRestoreGroovyBean() throws Exception
+ {
+ GroovyClassLoader cl = new GroovyClassLoader();
+ Class c = cl.parseClass(Thread.currentThread().getContextClassLoader().getResourceAsStream("SimpleBean.groovy"));
+ JsonValue ov = new ObjectValue();
+ StringValue sv = new StringValue("test restore groovy bean");
+ ov.addElement("value", sv);
+ assertEquals("test restore groovy bean", new BeanBuilder().createObject(c, ov).toString());
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testSerializeGroovyBean() throws Exception
+ {
+ GroovyClassLoader cl = new GroovyClassLoader();
+ Class c = cl.parseClass(Thread.currentThread().getContextClassLoader().getResourceAsStream("SimpleBean.groovy"));
+ GroovyObject groovyObject = (GroovyObject)c.newInstance();
+ groovyObject.invokeMethod("setValue", new Object[]{"test serialize groovy bean"});
+ assertEquals("{\"value\":\"test serialize groovy bean\"}", new JsonGeneratorImpl().createJsonObject(groovyObject)
+ .toString());
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testSerializeGroovyBean1() throws Exception
+ {
+ GroovyClassLoader cl = new GroovyClassLoader();
+ Class c = cl.parseClass(Thread.currentThread().getContextClassLoader().getResourceAsStream("BookStorage.groovy"));
+ GroovyObject groovyObject = (GroovyObject)c.newInstance();
+ groovyObject.invokeMethod("initStorage", new Object[]{});
+
+ JsonValue jsonValue = new JsonGeneratorImpl().createJsonObject(groovyObject);
+ //System.out.println(jsonValue);
+ assertTrue(jsonValue.isObject());
+ Iterator<JsonValue> iterator = jsonValue.getElement("books").getElements();
+ assertEquals("JUnit in Action", iterator.next().getElement("title").getStringValue());
+ assertEquals("Beginning C# 2008 from novice to professional", iterator.next().getElement("title")
+ .getStringValue());
+ assertEquals("Advanced JavaScript, Third Edition", iterator.next().getElement("title").getStringValue());
+ assertFalse(iterator.hasNext());
+ }
+
+ @SuppressWarnings("unchecked")
+ public void testRestoreGroovyBean1() throws Exception
+ {
+ GroovyClassLoader cl = new GroovyClassLoader();
+ Class c = cl.parseClass(Thread.currentThread().getContextClassLoader().getResourceAsStream("BookStorage.groovy"));
+ JsonParserImpl jsonParser = new JsonParserImpl();
+ JsonHandler jsonHandler = new JsonDefaultHandler();
+ jsonParser.parse(new InputStreamReader(Thread.currentThread().getContextClassLoader().getResourceAsStream(
+ "BookStorage.txt")), jsonHandler);
+ JsonValue jv = jsonHandler.getJsonObject();
+ GroovyObject o = (GroovyObject)new BeanBuilder().createObject(c, jv);
+ //System.out.println(o);
+ List<GroovyObject> books = (List<GroovyObject>)o.getProperty("books");
+ assertEquals(3, books.size());
+ assertEquals(books.get(0).getProperty("title"), "JUnit in Action");
+ assertEquals(books.get(1).getProperty("title"), "Beginning C# 2008 from novice to professional");
+ assertEquals(books.get(2).getProperty("title"), "Advanced JavaScript. Third Edition");
+ }
+
+}
Property changes on: ws/trunk/exo.ws.frameworks.json/src/test/java/org/exoplatform/ws/frameworks/json/impl/groovy/GroovyBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ws/trunk/exo.ws.frameworks.json/src/test/resources/BookBean.groovy
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/resources/BookBean.groovy (rev 0)
+++ ws/trunk/exo.ws.frameworks.json/src/test/resources/BookBean.groovy 2010-08-25 05:21:03 UTC (rev 2982)
@@ -0,0 +1,32 @@
+public class BookBean
+{
+
+ String author
+
+ String title
+
+ double price
+
+ long isdn
+
+ int pages
+
+ boolean availability
+
+ boolean delivery
+
+ String toString()
+ {
+ StringBuffer sb = new StringBuffer()
+ sb.append("Book:{").append("Author: ").append(author).append(" ").append("Title: ").append(title).append(" ")
+ .append("Pages: ").append(pages).append(" ").append("Price: ").append(price).append(" ").append("ISDN: ")
+ .append(isdn).append("Availability: ").append(availability).append(" ").append("Delivery: ").append(delivery)
+ .append(" ").append("} ")
+ sb.toString()
+ }
+
+ boolean equals(Object other)
+ {
+ return other != null && other instanceof BookBean && other.author == author && other.title == title && other.isdn == isdn && other.pages == pages && other.price == price && other.availability == availability && other.delivery == delivery
+ }
+}
\ No newline at end of file
Added: ws/trunk/exo.ws.frameworks.json/src/test/resources/BookStorage.groovy
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/resources/BookStorage.groovy (rev 0)
+++ ws/trunk/exo.ws.frameworks.json/src/test/resources/BookStorage.groovy 2010-08-25 05:21:03 UTC (rev 2982)
@@ -0,0 +1,51 @@
+
+public class BookStorage
+{
+
+ List<BookBean> books = new ArrayList<BookBean>()
+
+ public BookStorage()
+ {
+ }
+
+ void initStorage()
+ {
+
+ BookBean b1 = new BookBean(
+ author:'Vincent Masson',
+ title:'JUnit in Action',
+ pages:386,
+ price:19.37,
+ isdn:93011099534534L,
+ availability:true,
+ delivery:true)
+
+ BookBean b2 = new BookBean(
+ author:'Christian Gross',
+ title:'Beginning C# 2008 from novice to professional',
+ pages:511,
+ price:23.56,
+ isdn:9781590598696L,
+ availability:true,
+ delivery:true)
+
+ BookBean b3 = new BookBean(
+ author:'Chuck Easttom',
+ title:'Advanced JavaScript, Third Edition',
+ pages:617,
+ price:25.99,
+ isdn:9781598220339L,
+ availability:false,
+ delivery:false)
+
+ books.add(b1)
+ books.add(b2)
+ books.add(b3)
+ }
+
+ String toString()
+ {
+ books.toString()
+ }
+
+}
\ No newline at end of file
Added: ws/trunk/exo.ws.frameworks.json/src/test/resources/SimpleBean.groovy
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/test/resources/SimpleBean.groovy (rev 0)
+++ ws/trunk/exo.ws.frameworks.json/src/test/resources/SimpleBean.groovy 2010-08-25 05:21:03 UTC (rev 2982)
@@ -0,0 +1,9 @@
+public class SimpleBean
+{
+ String value
+
+ String toString()
+ {
+ value
+ }
+}
\ No newline at end of file
13 years, 10 months
exo-jcr SVN: r2981 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container and 1 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-24 03:18:30 -0400 (Tue, 24 Aug 2010)
New Revision: 2981
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml
Log:
EXOJCR-916: Duplicate instantiations are still possible however only the first corresponding instance will be kept, the other one will be available for the GC.
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-08-24 06:46:52 UTC (rev 2980)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-08-24 07:18:30 UTC (rev 2981)
@@ -91,7 +91,14 @@
}
// Please note that we cannot fully initialize the Object "instance_" before releasing other
// threads because it could cause StackOverflowError due to recursive calls
- instance_ = exocontainer.createComponent(getComponentImplementation(), params);
+ Object instance = exocontainer.createComponent(getComponentImplementation(), params);
+ if (instance_ != null)
+ {
+ // Avoid instantiating twice the same component in case of a cyclic reference due
+ // to component plugins
+ return instance_;
+ }
+ instance_ = instance;
}
if (debug)
Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-08-24 06:46:52 UTC (rev 2980)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-08-24 07:18:30 UTC (rev 2981)
@@ -76,6 +76,16 @@
assertEquals(value, plugin.myClass_);
}
+ public void testCyclicRef()
+ {
+ final RootContainer container = createRootContainer("test-exo-container.xml", "testCyclicRef");
+ A a = (A)container.getComponentInstanceOfType(A.class);
+ assertNotNull(a);
+ B b = (B)container.getComponentInstanceOfType(B.class);
+ assertNotNull(b);
+ assertEquals(a, b.a);
+ }
+
public void testCache()
{
URL rootURL = getClass().getResource("test-exo-container.xml");
@@ -461,4 +471,32 @@
}
}
+
+ public static class A
+ {
+ public B b;
+ public A(B b)
+ {
+ this.b = b;
+ }
+ }
+ public static class BPlugin extends BaseComponentPlugin
+ {
+ public A a;
+ public BPlugin(A a)
+ {
+ this.a = a;
+ }
+ }
+
+ public static class B
+ {
+ public A a;
+ public BPlugin plugin_;
+ public void add(BPlugin plugin)
+ {
+ this.plugin_ = plugin;
+ this.a = plugin.a;
+ }
+ }
}
\ No newline at end of file
Modified: kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml 2010-08-24 06:46:52 UTC (rev 2980)
+++ kernel/trunk/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml 2010-08-24 07:18:30 UTC (rev 2981)
@@ -45,4 +45,17 @@
</component-plugin>
</component-plugins>
</component>
+ <component profiles="testCyclicRef">
+ <type>org.exoplatform.container.TestExoContainer$A</type>
+ </component>
+ <component profiles="testCyclicRef">
+ <type>org.exoplatform.container.TestExoContainer$B</type>
+ <component-plugins>
+ <component-plugin>
+ <name>testCyclicRef</name>
+ <set-method>add</set-method>
+ <type>org.exoplatform.container.TestExoContainer$BPlugin</type>
+ </component-plugin>
+ </component-plugins>
+ </component>
</configuration>
\ No newline at end of file
13 years, 10 months
exo-jcr SVN: r2980 - in kernel/branches/2.2.x/exo.kernel.container/src: test/java/org/exoplatform/container and 1 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-24 02:46:52 -0400 (Tue, 24 Aug 2010)
New Revision: 2980
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml
Log:
EXOJCR-916: Duplicate instantiations are still possible however only the first corresponding instance will be kept, the other one will be available for the GC.
Modified: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-08-24 06:43:50 UTC (rev 2979)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-08-24 06:46:52 UTC (rev 2980)
@@ -91,7 +91,14 @@
}
// Please note that we cannot fully initialize the Object "instance_" before releasing other
// threads because it could cause StackOverflowError due to recursive calls
- instance_ = exocontainer.createComponent(getComponentImplementation(), params);
+ Object instance = exocontainer.createComponent(getComponentImplementation(), params);
+ if (instance_ != null)
+ {
+ // Avoid instantiating twice the same component in case of a cyclic reference due
+ // to component plugins
+ return instance_;
+ }
+ instance_ = instance;
}
if (debug)
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-08-24 06:43:50 UTC (rev 2979)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-08-24 06:46:52 UTC (rev 2980)
@@ -76,6 +76,16 @@
assertEquals(value, plugin.myClass_);
}
+ public void testCyclicRef()
+ {
+ final RootContainer container = createRootContainer("test-exo-container.xml", "testCyclicRef");
+ A a = (A)container.getComponentInstanceOfType(A.class);
+ assertNotNull(a);
+ B b = (B)container.getComponentInstanceOfType(B.class);
+ assertNotNull(b);
+ assertEquals(a, b.a);
+ }
+
public void testCache()
{
URL rootURL = getClass().getResource("test-exo-container.xml");
@@ -461,4 +471,32 @@
}
}
+
+ public static class A
+ {
+ public B b;
+ public A(B b)
+ {
+ this.b = b;
+ }
+ }
+ public static class BPlugin extends BaseComponentPlugin
+ {
+ public A a;
+ public BPlugin(A a)
+ {
+ this.a = a;
+ }
+ }
+
+ public static class B
+ {
+ public A a;
+ public BPlugin plugin_;
+ public void add(BPlugin plugin)
+ {
+ this.plugin_ = plugin;
+ this.a = plugin.a;
+ }
+ }
}
\ No newline at end of file
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml 2010-08-24 06:43:50 UTC (rev 2979)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/resources/org/exoplatform/container/test-exo-container.xml 2010-08-24 06:46:52 UTC (rev 2980)
@@ -45,4 +45,17 @@
</component-plugin>
</component-plugins>
</component>
+ <component profiles="testCyclicRef">
+ <type>org.exoplatform.container.TestExoContainer$A</type>
+ </component>
+ <component profiles="testCyclicRef">
+ <type>org.exoplatform.container.TestExoContainer$B</type>
+ <component-plugins>
+ <component-plugin>
+ <name>testCyclicRef</name>
+ <set-method>add</set-method>
+ <type>org.exoplatform.container.TestExoContainer$BPlugin</type>
+ </component-plugin>
+ </component-plugins>
+ </component>
</configuration>
\ No newline at end of file
13 years, 10 months
exo-jcr SVN: r2979 - core/trunk/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-24 02:43:50 -0400 (Tue, 24 Aug 2010)
New Revision: 2979
Modified:
core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
Log:
EXOJCR-917: core.packaging.module.js fixed
Modified: core/trunk/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2010-08-24 06:43:18 UTC (rev 2978)
+++ core/trunk/packaging/module/src/main/javascript/core.packaging.module.js 2010-08-24 06:43:50 UTC (rev 2979)
@@ -44,8 +44,8 @@
addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
addDependency(new Project("html-parser", "html-parser", "jar", "1.6")).
addDependency(new Project("org.apache.poi", "poi", "jar", "3.6")).
- addDependency(new Project("org.apache.poi", "poi-scratchpad", "jar", "3.6"));
- addDependency(new Project("org.apache.poi", "poi-ooxml", "jar", "3.6"));
+ addDependency(new Project("org.apache.poi", "poi-scratchpad", "jar", "3.6")).
+ addDependency(new Project("org.apache.poi", "poi-ooxml", "jar", "3.6")).
addDependency(new Project("org.apache.xmlbeans", "xmlbeans", "jar", "2.3.0"));
module.component.organization =
13 years, 10 months
exo-jcr SVN: r2978 - core/branches/2.3.x/packaging/module/src/main/javascript.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-24 02:43:18 -0400 (Tue, 24 Aug 2010)
New Revision: 2978
Modified:
core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js
Log:
EXOJCR-917: core.packaging.module.js fixed
Modified: core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js
===================================================================
--- core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js 2010-08-23 15:08:31 UTC (rev 2977)
+++ core/branches/2.3.x/packaging/module/src/main/javascript/core.packaging.module.js 2010-08-24 06:43:18 UTC (rev 2978)
@@ -44,8 +44,8 @@
addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
addDependency(new Project("html-parser", "html-parser", "jar", "1.6")).
addDependency(new Project("org.apache.poi", "poi", "jar", "3.6")).
- addDependency(new Project("org.apache.poi", "poi-scratchpad", "jar", "3.6"));
- addDependency(new Project("org.apache.poi", "poi-ooxml", "jar", "3.6"));
+ addDependency(new Project("org.apache.poi", "poi-scratchpad", "jar", "3.6")).
+ addDependency(new Project("org.apache.poi", "poi-ooxml", "jar", "3.6")).
addDependency(new Project("org.apache.xmlbeans", "xmlbeans", "jar", "2.3.0"));
module.component.organization =
13 years, 10 months
exo-jcr SVN: r2977 - ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2010-08-23 11:08:31 -0400 (Mon, 23 Aug 2010)
New Revision: 2977
Modified:
ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java
ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java
Log:
EXOJCR-890
Modified: ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java
===================================================================
--- ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java 2010-08-23 14:28:10 UTC (rev 2976)
+++ ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java 2010-08-23 15:08:31 UTC (rev 2977)
@@ -44,6 +44,16 @@
public class BeanBuilder
{
+ static final Collection<String> SKIP_METHODS = new HashSet<String>();
+
+ static
+ {
+ // Since we need support for Groovy must skip this.
+ // All "Groovy Objects" implements interface groovy.lang.GroovyObject
+ // and has method setMetaClass. Not need to process it.
+ SKIP_METHODS.add("setMetaClass");
+ }
+
/**
* Create Java Bean from Json Source.
*
@@ -67,21 +77,14 @@
for (Method method : methods)
{
-
String methodName = method.getName();
+ Class<?>[] parameterTypes = method.getParameterTypes();
- if (methodName.startsWith("set") && methodName.length() > "set".length())
+ if (!SKIP_METHODS.contains(methodName) && methodName.startsWith("set") && parameterTypes.length == 1
+ && methodName.length() > 3)
{
- Class<?>[] parameterTypes = method.getParameterTypes();
-
- if (parameterTypes.length != 1)
- {
- throw new JsonException("Each set method must have one parameters, but method " + clazz.getName() + "#"
- + method.getName() + " has " + parameterTypes.length);
- }
-
Class<?> methodParameterClazz = parameterTypes[0];
- String key = methodName.substring("set".length());
+ String key = methodName.substring(3);
// first letter to lower case
key = (key.length() > 1) ? Character.toLowerCase(key.charAt(0)) + key.substring(1) : key.toLowerCase();
Modified: ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java
===================================================================
--- ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java 2010-08-23 14:28:10 UTC (rev 2976)
+++ ws/branches/2.1.x/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java 2010-08-23 15:08:31 UTC (rev 2977)
@@ -37,6 +37,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -48,6 +49,18 @@
public class JsonGeneratorImpl implements JsonGenerator
{
+ static final Collection<String> SKIP_METHODS = new HashSet<String>();
+
+ static
+ {
+ // Prevent discovering of Java class.
+ SKIP_METHODS.add("getClass");
+ // Since we need support for Groovy must skip this.
+ // All "Groovy Objects" implements interface groovy.lang.GroovyObject
+ // and has method getMetaClass. Not need to discover it.
+ SKIP_METHODS.add("getMetaClass");
+ }
+
/**
* {@inheritDoc}
*/
@@ -61,25 +74,29 @@
for (Method method : methods)
{
- String name = method.getName();
+ String methodName = method.getName();
/*
- * Method must be as follow: 1. Name starts from "get" plus at least one
- * character or starts from "is" plus one more character and return
- * boolean type; 2. Must be without parameters; 3. Not "getClass" method;
+ * Method must be as follow:
+ * 1. Name starts from "get" plus at least one character or starts from
+ * "is" plus at least one more character and return boolean type
+ * 2. Must be without parameters
+ * 3. Must not be in list of skipped methods
*/
+
String key = null;
- if (name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0
- && !"getClass".equals(name))
+ if (!SKIP_METHODS.contains(methodName) && method.getParameterTypes().length == 0)
{
- key = name.substring(3);
+ if (methodName.startsWith("get") && methodName.length() > 3)
+ {
+ key = methodName.substring(3);
+ }
+ else if (methodName.startsWith("is") && methodName.length() > 2
+ && (method.getReturnType() == Boolean.class || method.getReturnType() == boolean.class))
+ {
+ key = methodName.substring(2);
+ }
}
- else if (name.startsWith("is") && name.length() > 2
- && (method.getReturnType() == Boolean.class || method.getReturnType() == boolean.class)
- && method.getParameterTypes().length == 0)
- {
- key = name.substring(2);
- }
if (key != null)
{
@@ -150,7 +167,7 @@
return new StringValue(Character.toString((Character)object));
case STRING :
return new StringValue((String)object);
- case ENUM:
+ case ENUM :
return new StringValue(((Enum)object).name());
case ARRAY_BOOLEAN : {
JsonValue jsonArray = new ArrayValue();
13 years, 10 months
exo-jcr SVN: r2976 - ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2010-08-23 10:28:10 -0400 (Mon, 23 Aug 2010)
New Revision: 2976
Modified:
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java
ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java
Log:
EXOJCR-890
Modified: ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java 2010-08-23 13:30:30 UTC (rev 2975)
+++ ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/BeanBuilder.java 2010-08-23 14:28:10 UTC (rev 2976)
@@ -44,6 +44,16 @@
public class BeanBuilder
{
+ static final Collection<String> SKIP_METHODS = new HashSet<String>();
+
+ static
+ {
+ // Since we need support for Groovy must skip this.
+ // All "Groovy Objects" implements interface groovy.lang.GroovyObject
+ // and has method setMetaClass. Not need to process it.
+ SKIP_METHODS.add("setMetaClass");
+ }
+
/**
* Create Java Bean from Json Source.
*
@@ -67,21 +77,14 @@
for (Method method : methods)
{
-
String methodName = method.getName();
+ Class<?>[] parameterTypes = method.getParameterTypes();
- if (methodName.startsWith("set") && methodName.length() > "set".length())
+ if (!SKIP_METHODS.contains(methodName) && methodName.startsWith("set") && parameterTypes.length == 1
+ && methodName.length() > 3)
{
- Class<?>[] parameterTypes = method.getParameterTypes();
-
- if (parameterTypes.length != 1)
- {
- throw new JsonException("Each set method must have one parameters, but method " + clazz.getName() + "#"
- + method.getName() + " has " + parameterTypes.length);
- }
-
Class<?> methodParameterClazz = parameterTypes[0];
- String key = methodName.substring("set".length());
+ String key = methodName.substring(3);
// first letter to lower case
key = (key.length() > 1) ? Character.toLowerCase(key.charAt(0)) + key.substring(1) : key.toLowerCase();
Modified: ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java
===================================================================
--- ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java 2010-08-23 13:30:30 UTC (rev 2975)
+++ ws/trunk/exo.ws.frameworks.json/src/main/java/org/exoplatform/ws/frameworks/json/impl/JsonGeneratorImpl.java 2010-08-23 14:28:10 UTC (rev 2976)
@@ -18,6 +18,17 @@
*/
package org.exoplatform.ws.frameworks.json.impl;
+import org.exoplatform.ws.frameworks.json.JsonGenerator;
+import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types;
+import org.exoplatform.ws.frameworks.json.value.JsonValue;
+import org.exoplatform.ws.frameworks.json.value.impl.ArrayValue;
+import org.exoplatform.ws.frameworks.json.value.impl.BooleanValue;
+import org.exoplatform.ws.frameworks.json.value.impl.DoubleValue;
+import org.exoplatform.ws.frameworks.json.value.impl.LongValue;
+import org.exoplatform.ws.frameworks.json.value.impl.NullValue;
+import org.exoplatform.ws.frameworks.json.value.impl.ObjectValue;
+import org.exoplatform.ws.frameworks.json.value.impl.StringValue;
+
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -26,21 +37,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.exoplatform.ws.frameworks.json.JsonGenerator;
-import org.exoplatform.ws.frameworks.json.impl.JsonUtils.Types;
-import org.exoplatform.ws.frameworks.json.value.JsonValue;
-import org.exoplatform.ws.frameworks.json.value.impl.ArrayValue;
-import org.exoplatform.ws.frameworks.json.value.impl.BooleanValue;
-import org.exoplatform.ws.frameworks.json.value.impl.DoubleValue;
-import org.exoplatform.ws.frameworks.json.value.impl.LongValue;
-import org.exoplatform.ws.frameworks.json.value.impl.NullValue;
-import org.exoplatform.ws.frameworks.json.value.impl.ObjectValue;
-import org.exoplatform.ws.frameworks.json.value.impl.StringValue;
-
/**
* @author <a href="mailto:andrew00x@gmail.com">Andrey Parfonov</a>
* @version $Id: JsonGeneratorImpl.java 34417 2009-07-23 14:42:56Z dkatayev $
@@ -48,8 +49,25 @@
public class JsonGeneratorImpl implements JsonGenerator
{
+ static final Collection<String> SKIP_METHODS = new HashSet<String>();
+
+ static
+ {
+ // Prevent discovering of Java class.
+ SKIP_METHODS.add("getClass");
+ // Since we need support for Groovy must skip this.
+ // All "Groovy Objects" implements interface groovy.lang.GroovyObject
+ // and has method getMetaClass. Not need to discover it.
+ SKIP_METHODS.add("getMetaClass");
+ }
+
/**
- * {@inheritDoc}
+ * Create JSON array from specified collection.
+ *
+ * @param collection source collection
+ * @return JSON representation of collection
+ * @throws JsonException if collection can't be transformed in JSON
+ * representation
*/
public JsonValue createJsonArray(Collection<?> collection) throws JsonException
{
@@ -61,7 +79,7 @@
{
// If :
// 1. Known types (primitive, String, array of primitive or String)
- // 2. Array of any object (expect for Java Bean)
+ // 2. Array of any object (expect for Java Bean)
// 3. Collection<?>
// 4. Map<String, ?>
if (JsonUtils.getType(o) != null)
@@ -73,7 +91,12 @@
}
/**
- * {@inheritDoc}
+ * Create JSON array from specified object. Parameter <code>array</code> must
+ * be array.
+ *
+ * @param array source array
+ * @return JSON representation of array
+ * @throws JsonException if array can't be transformed in JSON representation
*/
public JsonValue createJsonArray(Object array) throws JsonException
{
@@ -135,7 +158,7 @@
Object el = Array.get(array, i);
// If :
// 1. Known types (primitive, String, array of primitive or String)
- // 2. Array of any object (expect for Java Bean)
+ // 2. Array of any object (expect for Java Bean)
// 3. Collection<?>
// 4. Map<String, ?>
if (JsonUtils.getType(el) != null)
@@ -151,6 +174,13 @@
return jsonArray;
}
+ /**
+ * Create JSON object from specified map.
+ *
+ * @param map source map
+ * @return JSON representation of map
+ * @throws JsonException if map can't be transformed in JSON representation
+ */
public JsonValue createJsonObject(Map<String, Object> map) throws JsonException
{
if (map == null)
@@ -163,7 +193,7 @@
Object o = map.get(k);
// If :
// 1. Known types (primitive, String, array of primitive or String)
- // 2. Array of any object (expect for Java Bean)
+ // 2. Array of any object (expect for Java Bean)
// 3. Collection<?>
// 4. Map<String, ?>
if (JsonUtils.getType(o) != null)
@@ -187,25 +217,29 @@
for (Method method : methods)
{
- String name = method.getName();
+ String methodName = method.getName();
/*
- * Method must be as follow: 1. Name starts from "get" plus at least one
- * character or starts from "is" plus one more character and return
- * boolean type; 2. Must be without parameters; 3. Not "getClass" method;
+ * Method must be as follow:
+ * 1. Name starts from "get" plus at least one character or starts from
+ * "is" plus at least one more character and return boolean type
+ * 2. Must be without parameters
+ * 3. Must not be in list of skipped methods
*/
+
String key = null;
- if (name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0
- && !"getClass".equals(name))
+ if (!SKIP_METHODS.contains(methodName) && method.getParameterTypes().length == 0)
{
- key = name.substring(3);
+ if (methodName.startsWith("get") && methodName.length() > 3)
+ {
+ key = methodName.substring(3);
+ }
+ else if (methodName.startsWith("is") && methodName.length() > 2
+ && (method.getReturnType() == Boolean.class || method.getReturnType() == boolean.class))
+ {
+ key = methodName.substring(2);
+ }
}
- else if (name.startsWith("is") && name.length() > 2
- && (method.getReturnType() == Boolean.class || method.getReturnType() == boolean.class)
- && method.getParameterTypes().length == 0)
- {
- key = name.substring(2);
- }
if (key != null)
{
@@ -221,7 +255,7 @@
// If :
// 1. Known types (primitive, String, array of primitive or String)
- // 2. Array of any object (expect for Java Bean)
+ // 2. Array of any object (expect for Java Bean)
// 3. Collection<?>
// 4. Map<String, ?>
if (JsonUtils.getType(invokeResult) != null)
@@ -281,7 +315,7 @@
return new StringValue(Character.toString((Character)object));
case STRING :
return new StringValue((String)object);
- case ENUM:
+ case ENUM :
return new StringValue(((Enum)object).name());
case ARRAY_BOOLEAN : {
JsonValue jsonArray = new ArrayValue();
13 years, 10 months
exo-jcr SVN: r2975 - in jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules: kernel and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-23 09:30:30 -0400 (Mon, 23 Aug 2010)
New Revision: 2975
Added:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/manageability.xml
Modified:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.xml
Log:
EXOJCR-896: Port Manageability article into docbook
Added: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/manageability.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/manageability.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel/manageability.xml 2010-08-23 13:30:30 UTC (rev 2975)
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter id="Kernel.Manageability">
+ <?dbhtml filename="ch-kernel-menegeability.html"?>
+
+ <title>Manageability</title>
+
+ <section>
+ <title>Introduction</title>
+
+ <para>The kernel has a framework for exposing a management view of the
+ various sub systems of the platform. The management view is a lose term
+ for defining how we can access relevant information about the system and
+ how we can apply management operations. JMX is the de facto standard for
+ exposing a management view in the Java Platform but we take in
+ consideration other kind of views such as REST web services. Therefore the
+ framework is not tied to JMX, yet it provides a JMX part to define more
+ precisely details related to the JMX management view. The legacy framework
+ is still in use but is deprecated in favor of the new framework as it is
+ less tested and less efficient. It will be removed by sanitization in the
+ future.</para>
+ </section>
+
+ <section>
+ <title>Managed framework API</title>
+
+ <para>The managed frameworks defines an API for exposing a management view
+ of objects. The API is targeted for internal use and is not a public API.
+ The framework leverages Java 5 annotations to describe the management view
+ from an object.</para>
+
+ <section>
+ <title>Annotations</title>
+
+ <section>
+ <title>@org.exoplatform.management.annotations.Managed
+ annotation</title>
+
+ <para>The @Managed annotates elements that wants to expose a
+ management view to a management layer.</para>
+
+ <para><emphasis role="bold">@Managed for objects</emphasis></para>
+
+ <para>The framework will export a management view for the objects
+ annotated.</para>
+
+ <para><emphasis role="bold">@Managed for
+ getter/setter</emphasis></para>
+
+ <para>Defines a managed property. An annotated getter defines a read
+ property, an annotated setter defines a write property and if matching
+ getter/setter are annotated it defines a read/write property.</para>
+
+ <para><emphasis role="bold">@Managed on method</emphasis></para>
+
+ <para>Defines a managed operation.</para>
+ </section>
+
+ <section>
+ <title>@org.exoplatform.management.annotations.ManagedDescription</title>
+
+ <para>The @ManagedDescription annotation provides a description of a
+ managed element. It is valid to annotated object or methods. It takes
+ as sole argument a string that is the description value.</para>
+ </section>
+
+ <section>
+ <title>@org.exoplatform.management.annotations.ManagedName</title>
+
+ <para>The @ManagedName annotation provides an alternative name for
+ managed properties. It is used to accomodate legacy methods of an
+ object that can be renamed for compatibility reasons. It takes as sole
+ argument a string that is the name value.</para>
+ </section>
+
+ <section>
+ <title>@org.exoplatform.management.annotations.ManagedBy</title>
+
+ <para>The @ManagedBy annotation defines a delegate class for exposing
+ a management view. The sole argument of the annotation are class
+ litterals. The delegate class must provide a constructor with the
+ managed object as argument.</para>
+ </section>
+ </section>
+ </section>
+
+ <section>
+ <title>JMX Management View</title>
+
+ <section>
+ <title>JMX Annotations</title>
+
+ <section>
+ <title>@org.exoplatform.management.jmx.annotations.Property
+ annotation</title>
+
+ <para>The @Property annotation is used to within other annotations
+ such as @NameTemplate or @NamingContext. It should be seen as a
+ structural way for a list of properties. A property is made of a key
+ and a value. The value can either be a string litteral or it can be
+ surrounded by curly brace to be a dynamic property. A dynamic property
+ is resolved against the instance of the object at runtime.</para>
+ </section>
+
+ <section>
+ <title>@org.exoplatform.management.jmx.annotations.NameTemplate
+ annotation</title>
+
+ <para>The @NameTemplate defines a template that is used at
+ registration time of a managed object to create the JMX object name.
+ The template is formed of properties.</para>
+
+ <programlisting>@NameTemplate({
+ @Property(key="container", value="workspace"),
+ @Property(key="name", value="{Name}")})</programlisting>
+ </section>
+
+ <section>
+ <title>@org.exoplatform.management.jmx.annotations.NamingContext
+ annotation</title>
+
+ <para>The @NamingContext annotations defines a set of properties which
+ are used within a management context. It allows to propagate
+ properties down to managed objects which are defined by an object
+ implementing the ManagementAware interface. The goal is to scope
+ different instances of the same class that would have the same object
+ name otherwise.</para>
+
+ <programlisting>@NamingContext(@Property(key="workspace", value="{Name}"))</programlisting>
+ </section>
+ </section>
+ </section>
+
+ <section>
+ <title>Example</title>
+
+ <section>
+ <title>CacheService example</title>
+
+ <para>The cache service delegates most of the work to the
+ CacheServiceManaged class by using the @ManagedBy annotation. At runtime
+ when a new cache is creates it calls the CacheServiceManaged class in
+ order to let the CacheServiceManaged object register the cache.</para>
+
+ <programlisting>@ManagedBy(CacheServiceManaged.class)
+public class CacheServiceImpl implements CacheService {
+
+ CacheServiceManaged managed;
+ ...
+ synchronized private ExoCache createCacheInstance(String region) throws Exception {
+ ...
+ if (managed != null) {
+ managed.registerCache(simple);
+ }
+ ...
+ }
+}</programlisting>
+
+ <para>The ExoCache interface is annotated to define its management view.
+ The @NameTemplate is used to produce object name values when ExoCache
+ instance are registered.</para>
+
+ <programlisting>@Managed
+@NameTemplate({@Property(key="service", value="cache"), @Property(key="name", value="{Name}")})
+@ManagedDescription("Exo Cache")
+public interface ExoCache {
+
+ @Managed
+ @ManagedName("Name")
+ @ManagedDescription("The cache name")
+ public String getName();
+
+ @Managed
+ @ManagedName("Capacity")
+ @ManagedDescription("The maximum capacity")
+ public int getMaxSize();
+
+ @Managed
+ @ManagedDescription("Evict all entries of the cache")
+ public void clearCache() throws Exception;
+
+ ...
+}</programlisting>
+
+ <para>The CacheServiceManaged is the glue code between the CacheService
+ and the management view. The main reason is that only exo services are
+ registered automatically against the management view. Any other managed
+ bean must be registered manually for now. Therefore it needs to know
+ about the management layer via the management context. The management
+ context allows an object implementing the ManagementAware interface to
+ receive a context to perform further registration of managed
+ objects.</para>
+
+ <programlisting>@Managed
+public class CacheServiceManaged implements ManagementAware {
+
+ /** . */
+ private ManagementContext context;
+
+ /** . */
+ private CacheServiceImpl cacheService;
+
+ public CacheServiceManaged(CacheServiceImpl cacheService) {
+ this.cacheService = cacheService;
+
+ //
+ cacheService.managed = this;
+ }
+
+ public void setContext(ManagementContext context) {
+ this.context = context;
+ }
+
+ void registerCache(ExoCache cache) {
+ if (context != null) {
+ context.register(cache);
+ }
+ }
+}</programlisting>
+ </section>
+ </section>
+</chapter>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.xml 2010-08-23 12:54:52 UTC (rev 2974)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/kernel.xml 2010-08-23 13:30:30 UTC (rev 2975)
@@ -51,9 +51,6 @@
<xi:include href="kernel/logging.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
-
-
-
-
-
+ <xi:include href="kernel/manageability.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
</part>
13 years, 10 months
exo-jcr SVN: r2974 - in jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer: en and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-23 08:54:52 -0400 (Mon, 23 Aug 2010)
New Revision: 2974
Removed:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/
Modified:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
Log:
EXOJCR-905: reference removed, pom fixed
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-08-23 12:38:45 UTC (rev 2973)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-08-23 12:54:52 UTC (rev 2974)
@@ -99,11 +99,11 @@
<stylesheetResource>classpath:/xslt/org/exojcr/xhtml-single.xsl</stylesheetResource>
<finalName>index.html</finalName>
</format>
- <format>
+ <!--format>
<formatName>pdf</formatName>
<stylesheetResource>classpath://xslt/org/exojcr/pdf.xsl</stylesheetResource>
<finalName>index.pdf</finalName>
- </format>
+ </format-->
<!-- format>
<formatName>eclipse</formatName>
<stylesheetResource>classpath:/xslt/org/exojcr/eclipse.xsl</stylesheetResource>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-08-23 12:38:45 UTC (rev 2973)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-08-23 12:54:52 UTC (rev 2974)
@@ -1,37 +1,38 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<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">
- <parent>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.4-GA-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>reference-docs</artifactId>
-
- <name>eXo JCR :: Developer Documentation :: Reference</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>en</module>
- </modules>
-</project>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<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">
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.docs</artifactId>
+ <version>1.12.4-GA-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcr.docs.developer</artifactId>
+
+ <name>eXo JCR :: Developer Documentation :: Reactor</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>en</module>
+ </modules>
+</project>
+
13 years, 10 months
exo-jcr SVN: r2973 - in jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer: reference and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-23 08:38:45 -0400 (Mon, 23 Aug 2010)
New Revision: 2973
Added:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
Removed:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en/
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml
Log:
EXOJCR-905 exo.jcr.docs.developer/reference/ moved to exo.jcr.docs.developer
Copied: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en (from rev 2972, jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en)
Copied: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml (from rev 2972, jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml)
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-08-23 12:38:45 UTC (rev 2973)
@@ -0,0 +1,37 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<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">
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.docs.developer</artifactId>
+ <version>1.12.4-GA-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>reference-docs</artifactId>
+
+ <name>eXo JCR :: Developer Documentation :: Reference</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>en</module>
+ </modules>
+</project>
Deleted: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml 2010-08-23 12:30:54 UTC (rev 2972)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml 2010-08-23 12:38:45 UTC (rev 2973)
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<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">
- <parent>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.4-GA-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>reference-docs</artifactId>
-
- <name>eXo JCR :: Developer Documentation :: Reference</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>en</module>
- </modules>
-</project>
13 years, 10 months