You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/10/19 07:19:17 UTC
svn commit: r1024118 - in /incubator/isis/trunk/core: ./
metamodel/src/main/java/org/apache/isis/metamodel/specloader/
metamodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/
progmodel/ progmodel/src/ progmodel/src/main/ progmodel...
Author: danhaywood
Date: Tue Oct 19 05:19:17 2010
New Revision: 1024118
URL: http://svn.apache.org/viewvc?rev=1024118&view=rev
Log:
adding core/progmodel to hold the facet factories
Added:
incubator/isis/trunk/core/progmodel/
incubator/isis/trunk/core/progmodel/pom.xml
incubator/isis/trunk/core/progmodel/src/
incubator/isis/trunk/core/progmodel/src/main/
incubator/isis/trunk/core/progmodel/src/main/java/
incubator/isis/trunk/core/progmodel/src/main/resources/
incubator/isis/trunk/core/progmodel/src/test/
incubator/isis/trunk/core/progmodel/src/test/java/
incubator/isis/trunk/core/progmodel/src/test/resources/
Removed:
incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java
incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/progmodelfacets/ProgrammingModelFacetsJava5.java
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/objectstore/
incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/objectstore/inmemory/
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReflectorTestAbstract.java
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReflector_ArrayTest.java
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReflector_CollectionTest.java
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReflector_ObjectTest.java
incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReflector_ValueTest.java
Modified:
incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java
incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
incubator/isis/trunk/core/pom.xml
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java?rev=1024118&r1=1024117&r2=1024118&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ObjectReflectorAbstract.java Tue Oct 19 05:19:17 2010
@@ -20,50 +20,49 @@
package org.apache.isis.metamodel.specloader;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.apache.isis.commons.ensure.Ensure.ensureThatArg;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.apache.isis.commons.debug.DebugInfo;
-import org.apache.isis.commons.debug.DebugString;
-import org.apache.isis.commons.ensure.Assert;
-import org.apache.isis.commons.exceptions.IsisException;
-import org.apache.isis.commons.lang.JavaClassUtils;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ObjectList;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorSet;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
-import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.IntrospectableSpecification;
-import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
-import org.apache.isis.metamodel.specloader.internal.cache.SimpleSpecificationCache;
-import org.apache.isis.metamodel.specloader.internal.cache.SpecificationCache;
-import org.apache.isis.metamodel.specloader.internal.facetprocessor.FacetProcessor;
-import org.apache.isis.metamodel.specloader.internal.instances.InstanceCollectionSpecification;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import static org.apache.isis.commons.ensure.Ensure.ensureThatArg;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.isis.commons.debug.DebugInfo;
+import org.apache.isis.commons.debug.DebugString;
+import org.apache.isis.commons.ensure.Assert;
+import org.apache.isis.commons.exceptions.IsisException;
+import org.apache.isis.commons.lang.JavaClassUtils;
+import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.metamodel.adapter.ObjectList;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.metamodel.facetdecorator.FacetDecoratorSet;
+import org.apache.isis.metamodel.facets.Facet;
+import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
+import org.apache.isis.metamodel.runtimecontext.RuntimeContextAware;
+import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
+import org.apache.isis.metamodel.spec.IntrospectableSpecification;
+import org.apache.isis.metamodel.spec.JavaSpecification;
+import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.metamodel.spec.SpecificationFacets;
+import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
+import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
+import org.apache.isis.metamodel.specloader.internal.cache.SimpleSpecificationCache;
+import org.apache.isis.metamodel.specloader.internal.cache.SpecificationCache;
+import org.apache.isis.metamodel.specloader.internal.facetprocessor.FacetProcessor;
+import org.apache.isis.metamodel.specloader.internal.instances.InstanceCollectionSpecification;
+import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.log4j.Logger;
/**
- * Builds the meta-model for Java 5 programming model.
+ * Builds the meta-model.
*
* <p>
* The implementation provides for a degree of pluggability:
Modified: incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java?rev=1024118&r1=1024117&r2=1024118&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java (original)
+++ incubator/isis/trunk/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java Tue Oct 19 05:19:17 2010
@@ -20,18 +20,16 @@
package org.apache.isis.metamodel.specloader;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
-import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorIdentity;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
-import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverserDefault;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorNoop;
+import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.metamodel.facets.FacetFactory;
+import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
+import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverser;
+import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverserDefault;
+import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorNoop;
public final class ReflectorConstants {
@@ -39,7 +37,7 @@ public final class ReflectorConstants {
* Key used to lookup implementation of {@link ClassSubstitutor} in {@link IsisConfiguration}.
*/
public static final String CLASS_SUBSTITUTOR_CLASS_NAME_LIST = ConfigurationConstants.ROOT + "reflector.class-substitutor";
- public static final String CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT = ClassSubstitutorIdentity.class.getName();
+ public static final String CLASS_SUBSTITUTOR_CLASS_NAME_DEFAULT = "org.apache.isis.bytecode.cglib.specloader.classsubstitutor.CglibClassSubstitutorIdentity";
/**
* Key used to lookup implementation of {@link SpecificationTraverser} in {@link IsisConfiguration}.
@@ -47,8 +45,6 @@ public final class ReflectorConstants {
public static final String SPECIFICATION_TRAVERSER_CLASS_NAME = ConfigurationConstants.ROOT + "reflector.traverser";
public static final String SPECIFICATION_TRAVERSER_CLASS_NAME_DEFAULT = SpecificationTraverserDefault.class.getName();
-
-
/**
* Key used to lookup implementation of {@link ProgrammingModelFacets} in {@link IsisConfiguration}.
*
@@ -56,7 +52,7 @@ public final class ReflectorConstants {
* @see #FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST
*/
public static final String PROGRAMMING_MODEL_FACETS_CLASS_NAME = ConfigurationConstants.ROOT + "reflector.facets";
- public static final String PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT = ProgrammingModelFacetsJava5.class.getName();
+ public static final String PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT = "org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5";
/**
* Key used to lookup comma-separated list of {@link FacetFactory}s to include
@@ -88,8 +84,6 @@ public final class ReflectorConstants {
public static final String META_MODEL_VALIDATOR_CLASS_NAME = ConfigurationConstants.ROOT + "reflector.validator";
public static final String META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT = MetaModelValidatorNoop.class.getName();
-
-
private ReflectorConstants() {
}
Modified: incubator/isis/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/pom.xml?rev=1024118&r1=1024117&r2=1024118&view=diff
==============================================================================
--- incubator/isis/trunk/core/pom.xml (original)
+++ incubator/isis/trunk/core/pom.xml Tue Oct 19 05:19:17 2010
@@ -38,6 +38,7 @@
<module>testsupport</module>
<module>commons</module>
<module>metamodel</module>
+ <module>progmodel</module>
<module>runtime</module>
<module>webapp</module>
<module>webserver</module>
Added: incubator/isis/trunk/core/progmodel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/pom.xml?rev=1024118&view=auto
==============================================================================
--- incubator/isis/trunk/core/progmodel/pom.xml (added)
+++ incubator/isis/trunk/core/progmodel/pom.xml Tue Oct 19 05:19:17 2010
@@ -0,0 +1,43 @@
+<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>
+
+ <parent>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>core</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>progmodel</artifactId>
+ <name>Core ProgModel</name>
+
+ <properties>
+ <trunk.baseDir>${project.build.directory}/../../..</trunk.baseDir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>applib</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>applib</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>metamodel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>metamodel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>