You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/12/17 10:28:37 UTC
[61/81] [abbrv] zest-java git commit: ZEST-195 ;
Clean up the mistakes in the rename.
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
deleted file mode 100644
index 18e1c24..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-package org.apache.polygene.test;
-
-import org.apache.polygene.test.util.NotYetImplemented;
-import org.junit.After;
-import org.junit.Before;
-import org.apache.polygene.api.PolygeneAPI;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.ApplicationDescriptor;
-import org.apache.polygene.bootstrap.ApplicationAssembler;
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.ApplicationAssemblyFactory;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.Energy4Java;
-import org.apache.polygene.spi.PolygeneSPI;
-import org.junit.Rule;
-
-public abstract class AbstractPolygeneBaseTest
-{
- @Rule public NotYetImplemented.Rule notYetImplementedRule = new NotYetImplemented.Rule();
-
- protected PolygeneAPI api;
- protected PolygeneSPI spi;
-
- protected Energy4Java polygene;
- protected ApplicationDescriptor applicationModel;
- protected Application application;
-
- @Before
- public void setUp()
- throws Exception
- {
- polygene = new Energy4Java();
- applicationModel = newApplication();
- if( applicationModel == null )
- {
- // An AssemblyException has occurred that the Test wants to check for.
- return;
- }
- application = newApplicationInstance( applicationModel );
- initApplication( application );
- api = spi = polygene.spi();
- application.activate();
- }
-
- /** Called by the superclass for the test to define the entire application, every layer, every module and all
- * the contents of each module.
- *
- * @param applicationAssembly the {@link org.apache.polygene.bootstrap.ApplicationAssembly} to be populated.
- *
- * @throws AssemblyException on invalid assembly
- */
- protected abstract void defineApplication( ApplicationAssembly applicationAssembly )
- throws AssemblyException;
-
- protected Application newApplicationInstance( ApplicationDescriptor applicationModel )
- {
- return applicationModel.newInstance( polygene.api() );
- }
-
- protected ApplicationDescriptor newApplication()
- throws AssemblyException
- {
- ApplicationAssembler assembler = new ApplicationAssembler()
- {
- @Override
- public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )
- throws AssemblyException
- {
- ApplicationAssembly applicationAssembly = applicationFactory.newApplicationAssembly();
- applicationAssembly.setMode( Application.Mode.test );
- defineApplication( applicationAssembly );
- return applicationAssembly;
- }
- };
-
- try
- {
- return polygene.newApplicationModel( assembler );
- }
- catch( AssemblyException e )
- {
- assemblyException( e );
- return null;
- }
- }
-
- /**
- * This method is called when there was an AssemblyException in the creation of the Polygene application model.
- * <p>
- * Override this method to catch valid failures to place into satisfiedBy suites.
- * </p>
- * @param exception the exception thrown.
- *
- * @throws org.apache.polygene.bootstrap.AssemblyException The default implementation of this method will simply re-throw the exception.
- */
- protected void assemblyException( AssemblyException exception )
- throws AssemblyException
- {
- throw exception;
- }
-
- protected void initApplication( Application app )
- throws Exception
- {
- }
-
- @After
- public void tearDown()
- throws Exception
- {
- if( application != null )
- {
- application.passivate();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
deleted file mode 100644
index 4f85962..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.test;
-
-import org.apache.polygene.api.PolygeneAPI;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.ApplicationDescriptor;
-import org.apache.polygene.api.structure.Module;
-import org.apache.polygene.api.unitofwork.UnitOfWork;
-import org.apache.polygene.api.unitofwork.UnitOfWorkFactory;
-import org.apache.polygene.bootstrap.ApplicationAssembler;
-import org.apache.polygene.bootstrap.Assembler;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.Energy4Java;
-import org.apache.polygene.spi.PolygeneSPI;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-/**
- * Base class for Polygene scenario tests. This will create one Polygene application per class instead of per test.
- */
-public abstract class AbstractPolygeneScenarioTest
- implements Assembler
-{
- static protected PolygeneAPI api;
- static protected PolygeneSPI spi;
-
- static protected Energy4Java polygene;
- static protected ApplicationDescriptor applicationModel;
- static protected Application application;
-
- static protected Module module;
-
- static protected Assembler assembler; // Initialize this in static block of subclass
- private static UnitOfWorkFactory uowf;
-
- @BeforeClass
- public static void setUp()
- throws Exception
- {
- polygene = new Energy4Java();
- applicationModel = newApplication();
- if( applicationModel == null )
- {
- // An AssemblyException has occurred that the Test wants to check for.
- return;
- }
- application = applicationModel.newInstance( polygene.spi() );
- initApplication( application );
- api = spi = polygene.spi();
- application.activate();
-
- // Assume only one module
- module = application.findModule( "Layer 1", "Module 1" );
- uowf = module.unitOfWorkFactory();
- }
-
- static protected ApplicationDescriptor newApplication()
- throws AssemblyException
- {
- final Assembler asm = assembler;
-
- ApplicationAssembler assembler = applicationFactory -> applicationFactory.newApplicationAssembly( asm );
- try
- {
- return polygene.newApplicationModel( assembler );
- }
- catch( AssemblyException e )
- {
- assemblyException( e );
- return null;
- }
- }
-
- /**
- * This method is called when there was an AssemblyException in the creation of the Polygene application model.
- * <p>
- * Override this method to catch valid failures to place into satisfiedBy suites.
- * </p>
- *
- * @param exception the exception thrown.
- *
- * @throws org.apache.polygene.bootstrap.AssemblyException The default implementation of this method will simply re-throw the exception.
- */
- static protected void assemblyException( AssemblyException exception )
- throws AssemblyException
- {
- throw exception;
- }
-
- static protected void initApplication( Application app )
- throws Exception
- {
- }
-
- @AfterClass
- public void tearDown()
- throws Exception
- {
- if( uowf != null && uowf.isUnitOfWorkActive() )
- {
- while( uowf.isUnitOfWorkActive() )
- {
- UnitOfWork uow = uowf.currentUnitOfWork();
- if( uow.isOpen() )
- {
- uow.discard();
- }
- else
- {
- throw new InternalError( "I have seen a case where a UoW is on the stack, but not opened. First is" + uow
- .usecase()
- .name() );
- }
- }
- new Exception( "UnitOfWork not properly cleaned up" ).printStackTrace();
- }
-
- if( application != null )
- {
- application.passivate();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestTest.java
deleted file mode 100644
index db3c8d8..0000000
--- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.test;
-
-import org.apache.polygene.api.composite.TransientBuilderFactory;
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.object.ObjectFactory;
-import org.apache.polygene.api.query.QueryBuilderFactory;
-import org.apache.polygene.api.service.ServiceFinder;
-import org.apache.polygene.api.structure.Module;
-import org.apache.polygene.api.structure.ModuleDescriptor;
-import org.apache.polygene.api.unitofwork.UnitOfWork;
-import org.apache.polygene.api.unitofwork.UnitOfWorkFactory;
-import org.apache.polygene.api.value.ValueBuilderFactory;
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.Assembler;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.unitofwork.DefaultUnitOfWorkAssembler;
-import org.junit.After;
-import org.junit.Before;
-
-/**
- * Base class for Composite tests.
- */
-public abstract class AbstractPolygeneTest extends AbstractPolygeneBaseTest
- implements Assembler
-{
- @Structure
- protected UnitOfWorkFactory unitOfWorkFactory;
-
- @Structure
- protected TransientBuilderFactory transientBuilderFactory;
-
- @Structure
- protected ValueBuilderFactory valueBuilderFactory;
-
- @Structure
- protected ServiceFinder serviceFinder;
-
- @Structure
- protected ObjectFactory objectFactory;
-
- @Structure
- protected QueryBuilderFactory queryBuilderFactory;
-
- @Structure
- protected ModuleDescriptor module;
-
- @Before
- @Override
- public void setUp()
- throws Exception
- {
- super.setUp();
- if( application == null )
- {
- return; // failure in Assembly.
- }
- Module module = application.findModule( "Layer 1", "Module 1" );
- module.injectTo( this );
- }
-
- @Override
- protected void defineApplication( ApplicationAssembly applicationAssembly )
- throws AssemblyException
- {
- LayerAssembly layer = applicationAssembly.layer( "Layer 1" );
- ModuleAssembly module = layer.module( "Module 1" );
- new DefaultUnitOfWorkAssembler().assemble( module );
- module.objects( AbstractPolygeneTest.this.getClass() );
- assemble( module );
- }
-
- @After
- @Override
- public void tearDown()
- throws Exception
- {
- if( unitOfWorkFactory != null && unitOfWorkFactory.isUnitOfWorkActive() )
- {
- while( unitOfWorkFactory.isUnitOfWorkActive() )
- {
- UnitOfWork uow = unitOfWorkFactory.currentUnitOfWork();
- if( uow.isOpen() )
- {
- System.err.println( "UnitOfWork not cleaned up:" + uow.usecase().name() );
- uow.discard();
- }
- else
- {
- throw new InternalError( "I have seen a case where a UoW is on the stack, but not opened. First is: " + uow
- .usecase()
- .name() );
- }
- }
- new Exception( "UnitOfWork not properly cleaned up" ).printStackTrace();
- }
- super.tearDown();
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
index 008fb26..6e236fd 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/cache/AbstractCachePoolTest.java
@@ -21,13 +21,13 @@ package org.apache.polygene.test.cache;
import java.util.Collection;
import java.util.Random;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Test;
import org.apache.polygene.api.constraint.ConstraintViolation;
import org.apache.polygene.api.constraint.ConstraintViolationException;
import org.apache.polygene.api.util.NullArgumentException;
import org.apache.polygene.spi.cache.Cache;
import org.apache.polygene.spi.cache.CachePool;
-import org.apache.polygene.test.AbstractPolygeneTest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractValueCompositeSerializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractValueCompositeSerializationTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractValueCompositeSerializationTest.java
index 72cc069..44ab1f4 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractValueCompositeSerializationTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractValueCompositeSerializationTest.java
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.structure.Module;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -53,7 +54,6 @@ import org.apache.polygene.api.value.ValueComposite;
import org.apache.polygene.api.value.ValueSerialization;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import static org.hamcrest.CoreMatchers.equalTo;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 9fbc5de..6ffbfa0 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -37,7 +37,7 @@
<asfext:pmc rdf:resource="https://polygene.apache.org" />
<shortdesc>Apache Polygene is a community based effort exploring Composite Oriented Programming for domain centric application development.</shortdesc>
<description>Apache Polygene is a community based effort exploring Composite Oriented Programming for domain centric application development. This includes evolved concepts from Aspect Oriented Programming, Dependency Injection and Domain Driven Design. Composite Oriented Programming allows developers to work with 'fragments', smaller than classes, and 'compose' fragments into larger 'composites' which acts like the regular objects. Polygene also tackles the enforcement of application composition, i.e. composites are declared in modules, modules are contained in layers and access between layers are controlled/enforced. Apache Polygene\u2122 (Java Edition), first Apache Polygene sub-project, is an implementation of Composite Oriented Programming, using the standard Java platform, without the use of any pre-processors or new language elements. Everything you know from Java still applies and you can leverage both your experience and toolkits to become more productive with Composite Or
iented Programming today.</description>
- <bug-database rdf:resource="https://issues.apache.org/jira/browse/ZEST" />
+ <bug-database rdf:resource="https://issues.apache.org/jira/browse/POLYGENE" />
<mailing-list rdf:resource="https://www.apache.org/foundation/mailinglists.html" />
<download-page rdf:resource="https://polygene.apache.org/download.html" />
<programming-language>Java</programming-language>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java b/extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java
index f4cb13b..7715f9e 100644
--- a/extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java
+++ b/extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java
@@ -25,7 +25,7 @@ import org.apache.polygene.entitystore.prefs.assembly.PreferenceEntityStoreAssem
import org.apache.polygene.test.AbstractPolygeneTest;
public class DocumentationSupport
- extends AbstractPolygeneTest
+ extends AbstractPolygeneTest
{
// START SNIPPET: assembly
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
index f1c1b49..54d6570 100644
--- a/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
+++ b/extensions/indexing-sql/src/test/java/org/apache/polygene/index/sql/postgresql/PostgreSQLDBIntegrityTest.java
@@ -21,6 +21,7 @@ package org.apache.polygene.index.sql.postgresql;
import java.sql.Connection;
import javax.sql.DataSource;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,7 +38,6 @@ import org.apache.polygene.index.sql.support.common.GenericDatabaseExplorer.Data
import org.apache.polygene.index.sql.support.postgresql.PostgreSQLAppStartup;
import org.apache.polygene.library.sql.common.SQLConfiguration;
import org.apache.polygene.library.sql.common.SQLUtil;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.sql.generation.api.vendor.PostgreSQLVendor;
import org.sql.generation.api.vendor.SQLVendorProvider;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
index 8e69504..5bf2ac8 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java
@@ -20,6 +20,7 @@
package org.apache.polygene.library.alarm;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Test;
import org.apache.polygene.api.mixin.Mixins;
import org.apache.polygene.api.service.ServiceComposite;
@@ -28,7 +29,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWork;
import org.apache.polygene.api.value.ValueBuilder;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import java.util.Map;
import org.apache.polygene.test.EntityTestAssembler;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
index 84b6715..2281e34 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java
@@ -21,6 +21,7 @@ package org.apache.polygene.library.alarm;
import java.util.List;
import java.util.Locale;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Test;
import org.apache.polygene.api.constraint.ConstraintViolationException;
import org.apache.polygene.api.mixin.Mixins;
@@ -30,7 +31,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWork;
import org.apache.polygene.api.value.ValueBuilder;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
index 9bb7013..dd97c15 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java
@@ -23,6 +23,7 @@ import java.time.Instant;
import java.util.List;
import java.util.Locale;
import org.apache.polygene.api.identity.Identity;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Test;
import org.apache.polygene.api.entity.EntityBuilder;
import org.apache.polygene.api.mixin.Mixins;
@@ -31,7 +32,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWork;
import org.apache.polygene.api.value.ValueBuilder;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
index 74e9df0..aa247cd 100644
--- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
+++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java
@@ -24,6 +24,7 @@ import java.time.Instant;
import java.util.List;
import java.util.Locale;
import org.apache.polygene.api.identity.Identity;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Assert;
import org.junit.Test;
import org.apache.polygene.api.entity.EntityBuilder;
@@ -33,7 +34,6 @@ import org.apache.polygene.api.unitofwork.UnitOfWork;
import org.apache.polygene.api.value.ValueBuilder;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
index 967f32b..d186597 100644
--- a/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
+++ b/libraries/circuitbreaker/src/test/java/org/apache/polygene/library/circuitbreaker/BreaksCircuitOnThrowableTest.java
@@ -35,7 +35,7 @@ import org.apache.polygene.test.AbstractPolygeneTest;
* Test @BreaksCircuitOnThrowable annotation
*/
public class BreaksCircuitOnThrowableTest
- extends AbstractPolygeneTest
+ extends AbstractPolygeneTest
{
// START SNIPPET: service
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/constraints/src/test/java/org/apache/polygene/library/constraints/ConstraintTest.java
----------------------------------------------------------------------
diff --git a/libraries/constraints/src/test/java/org/apache/polygene/library/constraints/ConstraintTest.java b/libraries/constraints/src/test/java/org/apache/polygene/library/constraints/ConstraintTest.java
index c16d4f1..a0d6346 100644
--- a/libraries/constraints/src/test/java/org/apache/polygene/library/constraints/ConstraintTest.java
+++ b/libraries/constraints/src/test/java/org/apache/polygene/library/constraints/ConstraintTest.java
@@ -22,12 +22,12 @@ package org.apache.polygene.library.constraints;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Test;
import org.apache.polygene.api.composite.TransientBuilder;
import org.apache.polygene.api.constraint.ConstraintViolationException;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractJettyTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractJettyTest.java b/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractJettyTest.java
index 282382a..bfa1c53 100644
--- a/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractJettyTest.java
+++ b/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractJettyTest.java
@@ -29,12 +29,11 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.apache.polygene.test.AbstractPolygeneTest;
-
public abstract class AbstractJettyTest
extends AbstractPolygeneTest
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/http/src/test/java/org/apache/polygene/library/http/JettyJMXStatisticsTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyJMXStatisticsTest.java b/libraries/http/src/test/java/org/apache/polygene/library/http/JettyJMXStatisticsTest.java
index 436d9b4..c8ba055 100644
--- a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyJMXStatisticsTest.java
+++ b/libraries/http/src/test/java/org/apache/polygene/library/http/JettyJMXStatisticsTest.java
@@ -19,13 +19,13 @@
*/
package org.apache.polygene.library.http;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.util.FreePortFinder;
import org.junit.Test;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.library.jmx.JMXAssembler;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import static org.apache.polygene.library.http.Servlets.addServlets;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/http/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/resources/logback.xml b/libraries/http/src/test/resources/logback.xml
index ae07ef3..cacadbd 100644
--- a/libraries/http/src/test/resources/logback.xml
+++ b/libraries/http/src/test/resources/logback.xml
@@ -22,7 +22,7 @@
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>[ZEST] @%-20thread %-5level %logger{36} - %msg%n</pattern>
+ <pattern>[POLYGENE] @%-20thread %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/http/src/vhost-test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/libraries/http/src/vhost-test/resources/logback.xml b/libraries/http/src/vhost-test/resources/logback.xml
index ae07ef3..cacadbd 100644
--- a/libraries/http/src/vhost-test/resources/logback.xml
+++ b/libraries/http/src/vhost-test/resources/logback.xml
@@ -22,7 +22,7 @@
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>[ZEST] @%-20thread %-5level %logger{36} - %msg%n</pattern>
+ <pattern>[POLYGENE] @%-20thread %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/PolygeneMBeans.java
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/PolygeneMBeans.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/PolygeneMBeans.java
new file mode 100644
index 0000000..d7d5bd6
--- /dev/null
+++ b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/PolygeneMBeans.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+package org.apache.polygene.library.jmx;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+/**
+ * Helper for working with Polygene MBeans.
+ */
+public class PolygeneMBeans
+{
+ public static ObjectName findServiceName( MBeanServer server, String applicationName, String serviceId )
+ throws MalformedObjectNameException
+ {
+ ObjectName objectName = new ObjectName( "Polygene:application=" + applicationName + ",*,service=" + serviceId );
+ return server.queryNames( objectName, null ).stream()
+ .filter( item -> item.getKeyPropertyList().size() == 5 )
+ .findFirst().orElse( null );
+ }
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ZestMBeans.java
----------------------------------------------------------------------
diff --git a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ZestMBeans.java b/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ZestMBeans.java
deleted file mode 100644
index d7d5bd6..0000000
--- a/libraries/jmx/src/main/java/org/apache/polygene/library/jmx/ZestMBeans.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-package org.apache.polygene.library.jmx;
-
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
-/**
- * Helper for working with Polygene MBeans.
- */
-public class PolygeneMBeans
-{
- public static ObjectName findServiceName( MBeanServer server, String applicationName, String serviceId )
- throws MalformedObjectNameException
- {
- ObjectName objectName = new ObjectName( "Polygene:application=" + applicationName + ",*,service=" + serviceId );
- return server.queryNames( objectName, null ).stream()
- .filter( item -> item.getKeyPropertyList().size() == 5 )
- .findFirst().orElse( null );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/lang-groovy/src/test/groovy/org/apache/polygene/library/groovy/GroovyMixinTest.java
----------------------------------------------------------------------
diff --git a/libraries/lang-groovy/src/test/groovy/org/apache/polygene/library/groovy/GroovyMixinTest.java b/libraries/lang-groovy/src/test/groovy/org/apache/polygene/library/groovy/GroovyMixinTest.java
index eb58986..7691fb6 100644
--- a/libraries/lang-groovy/src/test/groovy/org/apache/polygene/library/groovy/GroovyMixinTest.java
+++ b/libraries/lang-groovy/src/test/groovy/org/apache/polygene/library/groovy/GroovyMixinTest.java
@@ -19,11 +19,11 @@
*/
package org.apache.polygene.library.groovy;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Assert;
import org.junit.Test;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
public class GroovyMixinTest extends AbstractPolygeneTest
{
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/metrics/src/test/java/org/apache/polygene/library/metrics/AbstractTimingCaptureTest.java
----------------------------------------------------------------------
diff --git a/libraries/metrics/src/test/java/org/apache/polygene/library/metrics/AbstractTimingCaptureTest.java b/libraries/metrics/src/test/java/org/apache/polygene/library/metrics/AbstractTimingCaptureTest.java
index ee3c22e..8e28370 100644
--- a/libraries/metrics/src/test/java/org/apache/polygene/library/metrics/AbstractTimingCaptureTest.java
+++ b/libraries/metrics/src/test/java/org/apache/polygene/library/metrics/AbstractTimingCaptureTest.java
@@ -34,7 +34,8 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-abstract class AbstractTimingCaptureTest extends AbstractPolygeneTest {
+abstract class AbstractTimingCaptureTest extends AbstractPolygeneTest
+{
@Override
public void assemble( ModuleAssembly module )
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntity.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntity.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntity.java
new file mode 100644
index 0000000..3e97ae8
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntity.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Polygene Entity data.
+ */
+public interface PolygeneEntity
+{
+ // Model
+ String NAMESPACE = "http://polygene.apache.org/rdf/entity/1.0/";
+
+ // Types
+ URI ENTITY = new URIImpl( NAMESPACE + "entity" );
+ URI ENTITYTYPEREFERENCE = new URIImpl( NAMESPACE + "entitytypereference" );
+ URI QUALIFIER = new URIImpl( NAMESPACE + "qualifier" );
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntityType.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntityType.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntityType.java
new file mode 100644
index 0000000..2d63daa
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneEntityType.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Polygene EntityType data.
+ */
+public interface PolygeneEntityType
+{
+ // Namespace
+ String NAMESPACE = "http://polygene.apache.org/rdf/entitytype/1.0/";
+
+ // Predicates
+ URI QUERYABLE = new URIImpl( NAMESPACE + "queryable" );
+ URI VERSION = new URIImpl( NAMESPACE + "version" );
+ URI TYPE = new URIImpl( NAMESPACE + "type" );
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneRdf.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneRdf.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneRdf.java
new file mode 100644
index 0000000..8afd4f8
--- /dev/null
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/PolygeneRdf.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rdf;
+
+import org.openrdf.model.URI;
+import org.openrdf.model.impl.URIImpl;
+
+
+/**
+ * This is the RDF vocabulary for Polygene.
+ */
+public interface PolygeneRdf
+{
+
+ // MODEL
+ // Namespace TODO: Need to figure out what these should really be!
+ String POLYGENE_MODEL = "http://polygene.apache.org/rdf/model/1.0/";
+
+ String POLYGENE_MODEL_TYPES = "http://polygene.apache.org/rdf/model/1.0/type#";
+ String POLYGENE_MODEL_RELATIONSHIPS = "http://polygene.apache.org/rdf/module/1.0/";
+ String POLYGENE_MODEL_PROPERTIES = "http://polygene.apache.org/rdf/model/1.0/property#";
+
+ // Types
+ URI TYPE_APPLICATION = new URIImpl( POLYGENE_MODEL_TYPES + "application" );
+ URI TYPE_LAYER = new URIImpl( POLYGENE_MODEL_TYPES + "layer" );
+ URI TYPE_MODULE = new URIImpl( POLYGENE_MODEL_TYPES + "module" );
+ URI TYPE_ENTITY = new URIImpl( POLYGENE_MODEL_TYPES + "entity" );
+ URI TYPE_QUALIFIER = new URIImpl( POLYGENE_MODEL_TYPES + "qualifier" );
+ URI TYPE_COMPOSITE = new URIImpl( POLYGENE_MODEL_TYPES + "composite" );
+ URI TYPE_SERVICE = new URIImpl( POLYGENE_MODEL_TYPES + "service" );
+ URI TYPE_METHOD = new URIImpl( POLYGENE_MODEL_TYPES + "method" );
+ URI TYPE_CONSTRAINT = new URIImpl( POLYGENE_MODEL_TYPES + "constraint" );
+ URI TYPE_CONCERN = new URIImpl( POLYGENE_MODEL_TYPES + "concern" );
+ URI TYPE_CONSTRUCTOR = new URIImpl( POLYGENE_MODEL_TYPES + "constructor" );
+ URI TYPE_SIDEEFFECT = new URIImpl( POLYGENE_MODEL_TYPES + "sideeffect" );
+ URI TYPE_MIXIN = new URIImpl( POLYGENE_MODEL_TYPES + "mixin" );
+ URI TYPE_FIELD = new URIImpl( POLYGENE_MODEL_TYPES + "field" );
+ URI TYPE_CLASS = new URIImpl( POLYGENE_MODEL_TYPES + "class" );
+ URI TYPE_OBJECT = new URIImpl( POLYGENE_MODEL_TYPES + "object" );
+ URI TYPE_PARAMETER = new URIImpl( POLYGENE_MODEL_TYPES + "parameter" );
+ URI TYPE_INJECTION = new URIImpl( POLYGENE_MODEL_TYPES + "injection" );
+ URI TYPE_INFO = new URIImpl( POLYGENE_MODEL_TYPES + "info" );
+
+ // Properties
+ URI HAS_INJECTIONS = new URIImpl( POLYGENE_MODEL_PROPERTIES + "hasinjections" );
+
+ // Relationship
+ URI RELATIONSHIP_COMPOSITE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "composite" );
+ URI RELATIONSHIP_ENTITY = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "entity" );
+ URI RELATIONSHIP_SERVICE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "service" );
+ URI RELATIONSHIP_OBJECT = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "object" );
+ URI RELATIONSHIP_PRIVATE_METHOD = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "private/method" );
+ URI RELATIONSHIP_INJECTION = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "injection" );
+ URI RELATIONSHIP_CONSTRUCTOR = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "constructor" );
+ URI RELATIONSHIP_FIELD = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "field" );
+ URI RELATIONSHIP_APPLIESTO = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "appliesto" );
+ URI RELATIONSHIP_METHOD = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "method" );
+ URI RELATIONSHIP_CONSTRAINT = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "constraint" );
+ URI RELATIONSHIP_CONCERN = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "concern" );
+ URI RELATIONSHIP_SIDEEFFECT = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "sideeffect" );
+ URI RELATIONSHIP_PUBLIC_SERVICE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "public/service" );
+ URI RELATIONSHIP_PRIVATE_SERVICE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "private/service" );
+ URI RELATIONSHIP_PROVIDEDBY = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "providedby" );
+ URI RELATIONSHIP_SERVICEINFO = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "info/service" );
+ URI RELATIONSHIP_INFOVALUE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "info/value" );
+ URI RELATIONSHIP_MIXIN = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "mixin" );
+ URI RELATIONSHIP_LAYER = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "layer" );
+ URI RELATIONSHIP_MODULE = new URIImpl( POLYGENE_MODEL_RELATIONSHIPS + "module" );
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntity.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntity.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntity.java
deleted file mode 100644
index 3e97ae8..0000000
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Polygene Entity data.
- */
-public interface PolygeneEntity
-{
- // Model
- String NAMESPACE = "http://polygene.apache.org/rdf/entity/1.0/";
-
- // Types
- URI ENTITY = new URIImpl( NAMESPACE + "entity" );
- URI ENTITYTYPEREFERENCE = new URIImpl( NAMESPACE + "entitytypereference" );
- URI QUALIFIER = new URIImpl( NAMESPACE + "qualifier" );
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntityType.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntityType.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntityType.java
deleted file mode 100644
index 2d63daa..0000000
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestEntityType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Polygene EntityType data.
- */
-public interface PolygeneEntityType
-{
- // Namespace
- String NAMESPACE = "http://polygene.apache.org/rdf/entitytype/1.0/";
-
- // Predicates
- URI QUERYABLE = new URIImpl( NAMESPACE + "queryable" );
- URI VERSION = new URIImpl( NAMESPACE + "version" );
- URI TYPE = new URIImpl( NAMESPACE + "type" );
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestRdf.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestRdf.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestRdf.java
deleted file mode 100644
index 1a8a624..0000000
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/ZestRdf.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rdf;
-
-import org.openrdf.model.URI;
-import org.openrdf.model.impl.URIImpl;
-
-
-/**
- * This is the RDF vocabulary for Polygene.
- */
-public interface PolygeneRdf
-{
-
- // MODEL
- // Namespace TODO: Need to figure out what these should really be!
- String ZEST_MODEL = "http://polygene.apache.org/rdf/model/1.0/";
-
- String ZEST_MODEL_TYPES = "http://polygene.apache.org/rdf/model/1.0/type#";
- String ZEST_MODEL_RELATIONSHIPS = "http://polygene.apache.org/rdf/module/1.0/";
- String ZEST_MODEL_PROPERTIES = "http://polygene.apache.org/rdf/model/1.0/property#";
-
- // Types
- URI TYPE_APPLICATION = new URIImpl( ZEST_MODEL_TYPES + "application" );
- URI TYPE_LAYER = new URIImpl( ZEST_MODEL_TYPES + "layer" );
- URI TYPE_MODULE = new URIImpl( ZEST_MODEL_TYPES + "module" );
- URI TYPE_ENTITY = new URIImpl( ZEST_MODEL_TYPES + "entity" );
- URI TYPE_QUALIFIER = new URIImpl( ZEST_MODEL_TYPES + "qualifier" );
- URI TYPE_COMPOSITE = new URIImpl( ZEST_MODEL_TYPES + "composite" );
- URI TYPE_SERVICE = new URIImpl( ZEST_MODEL_TYPES + "service" );
- URI TYPE_METHOD = new URIImpl( ZEST_MODEL_TYPES + "method" );
- URI TYPE_CONSTRAINT = new URIImpl( ZEST_MODEL_TYPES + "constraint" );
- URI TYPE_CONCERN = new URIImpl( ZEST_MODEL_TYPES + "concern" );
- URI TYPE_CONSTRUCTOR = new URIImpl( ZEST_MODEL_TYPES + "constructor" );
- URI TYPE_SIDEEFFECT = new URIImpl( ZEST_MODEL_TYPES + "sideeffect" );
- URI TYPE_MIXIN = new URIImpl( ZEST_MODEL_TYPES + "mixin" );
- URI TYPE_FIELD = new URIImpl( ZEST_MODEL_TYPES + "field" );
- URI TYPE_CLASS = new URIImpl( ZEST_MODEL_TYPES + "class" );
- URI TYPE_OBJECT = new URIImpl( ZEST_MODEL_TYPES + "object" );
- URI TYPE_PARAMETER = new URIImpl( ZEST_MODEL_TYPES + "parameter" );
- URI TYPE_INJECTION = new URIImpl( ZEST_MODEL_TYPES + "injection" );
- URI TYPE_INFO = new URIImpl( ZEST_MODEL_TYPES + "info" );
-
- // Properties
- URI HAS_INJECTIONS = new URIImpl( ZEST_MODEL_PROPERTIES + "hasinjections" );
-
- // Relationship
- URI RELATIONSHIP_COMPOSITE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "composite" );
- URI RELATIONSHIP_ENTITY = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "entity" );
- URI RELATIONSHIP_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "service" );
- URI RELATIONSHIP_OBJECT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "object" );
- URI RELATIONSHIP_PRIVATE_METHOD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "private/method" );
- URI RELATIONSHIP_INJECTION = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "injection" );
- URI RELATIONSHIP_CONSTRUCTOR = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "constructor" );
- URI RELATIONSHIP_FIELD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "field" );
- URI RELATIONSHIP_APPLIESTO = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "appliesto" );
- URI RELATIONSHIP_METHOD = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "method" );
- URI RELATIONSHIP_CONSTRAINT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "constraint" );
- URI RELATIONSHIP_CONCERN = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "concern" );
- URI RELATIONSHIP_SIDEEFFECT = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "sideeffect" );
- URI RELATIONSHIP_PUBLIC_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "public/service" );
- URI RELATIONSHIP_PRIVATE_SERVICE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "private/service" );
- URI RELATIONSHIP_PROVIDEDBY = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "providedby" );
- URI RELATIONSHIP_SERVICEINFO = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "info/service" );
- URI RELATIONSHIP_INFOVALUE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "info/value" );
- URI RELATIONSHIP_MIXIN = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "mixin" );
- URI RELATIONSHIP_LAYER = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "layer" );
- URI RELATIONSHIP_MODULE = new URIImpl( ZEST_MODEL_RELATIONSHIPS + "module" );
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/serializer/AbstractSerializer.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/serializer/AbstractSerializer.java b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/serializer/AbstractSerializer.java
index e0d94bd..bca0d6e 100644
--- a/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/serializer/AbstractSerializer.java
+++ b/libraries/rdf/src/main/java/org/apache/polygene/library/rdf/serializer/AbstractSerializer.java
@@ -42,7 +42,7 @@ abstract class AbstractSerializer
public void serialize( Iterable<Statement> graph, Writer out ) throws RDFHandlerException
{
String[] prefixes = { "polygene", "rdf", "rdfs" };
- String[] namespaces = { PolygeneRdf.ZEST_MODEL, Rdfs.RDF, Rdfs.RDFS };
+ String[] namespaces = { PolygeneRdf.POLYGENE_MODEL, Rdfs.RDF, Rdfs.RDFS };
serialize( graph, out, prefixes, namespaces );
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/ApplicationXmlTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/ApplicationXmlTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/ApplicationXmlTest.java
index e0aad0c..e953c9b 100644
--- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/ApplicationXmlTest.java
+++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/ApplicationXmlTest.java
@@ -87,7 +87,7 @@ public class ApplicationXmlTest extends AbstractPolygeneTest
throws RDFHandlerException
{
writer.startRDF();
- writer.handleNamespace( "polygene", PolygeneRdf.ZEST_MODEL );
+ writer.handleNamespace( "polygene", PolygeneRdf.POLYGENE_MODEL );
writer.handleNamespace( "rdf", Rdfs.RDF );
writer.handleNamespace( "rdfs", Rdfs.RDFS );
for( Statement st : graph )
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
index 6e3e394..0ef8475 100644
--- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
+++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java
@@ -24,6 +24,7 @@ import java.io.PrintWriter;
import java.time.Instant;
import org.apache.polygene.api.identity.StringIdentity;
import org.apache.polygene.api.time.SystemTime;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Before;
import org.junit.Test;
import org.openrdf.model.Statement;
@@ -45,7 +46,6 @@ import org.apache.polygene.library.rdf.serializer.RdfXmlSerializer;
import org.apache.polygene.spi.entity.EntityState;
import org.apache.polygene.spi.entitystore.EntityStore;
import org.apache.polygene.spi.entitystore.EntityStoreUnitOfWork;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.EntityTestAssembler;
import org.apache.polygene.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
index 9fb27e8..6c1d279 100644
--- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
+++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java
@@ -21,6 +21,7 @@
package org.apache.polygene.library.rdf.entity;
import org.apache.polygene.api.identity.StringIdentity;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.Before;
import org.junit.Test;
import org.openrdf.model.Statement;
@@ -39,7 +40,6 @@ import org.apache.polygene.library.rdf.PolygeneEntityType;
import org.apache.polygene.library.rdf.Rdfs;
import org.apache.polygene.library.rdf.serializer.RdfXmlSerializer;
import org.apache.polygene.spi.entitystore.EntityStore;
-import org.apache.polygene.test.AbstractPolygeneTest;
import java.io.PrintWriter;
import org.apache.polygene.test.EntityTestAssembler;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryTest.java
index 2b26c85..bce71ed 100644
--- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryTest.java
+++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/MemoryRepositoryTest.java
@@ -20,6 +20,7 @@
package org.apache.polygene.library.rdf.repository;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
@@ -29,7 +30,6 @@ import org.openrdf.repository.RepositoryException;
import org.apache.polygene.api.injection.scope.Service;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
/**
* JAVADOC
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContinuousIntegrationTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContinuousIntegrationTest.java b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContinuousIntegrationTest.java
index 3da87d1..69d460e 100644
--- a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContinuousIntegrationTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContinuousIntegrationTest.java
@@ -19,6 +19,7 @@
*/
package org.apache.polygene.library.rest.client;
+import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.test.util.FreePortFinder;
import org.hamcrest.CoreMatchers;
import org.junit.After;
@@ -52,7 +53,6 @@ import org.apache.polygene.library.rest.server.api.ContextRestlet;
import org.apache.polygene.library.rest.server.assembler.RestServerAssembler;
import org.apache.polygene.library.rest.server.restlet.NullCommandResult;
import org.apache.polygene.library.rest.server.spi.CommandResult;
-import org.apache.polygene.test.AbstractPolygeneTest;
import org.apache.polygene.valueserialization.orgjson.OrgJsonValueSerializationAssembler;
import org.restlet.Client;
import org.restlet.Request;
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneFinder.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneFinder.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneFinder.java
new file mode 100644
index 0000000..b261ed3
--- /dev/null
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneFinder.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rest.admin;
+
+import org.apache.polygene.api.injection.scope.Structure;
+import org.apache.polygene.api.object.ObjectFactory;
+import org.restlet.Request;
+import org.restlet.Response;
+import org.restlet.resource.Finder;
+import org.restlet.resource.ServerResource;
+
+public class PolygeneFinder
+ extends Finder
+{
+ @Structure
+ private ObjectFactory factory;
+
+ public PolygeneFinder()
+ {
+ }
+
+ @Override
+ public ServerResource create( Class<? extends ServerResource> targetClass, Request request, Response response )
+ {
+ return factory.newObject( targetClass );
+ }
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServlet.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServlet.java
new file mode 100644
index 0000000..f9e2490
--- /dev/null
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServlet.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rest.admin;
+
+import org.apache.polygene.api.injection.scope.Structure;
+import org.apache.polygene.api.structure.Module;
+import org.restlet.Application;
+import org.restlet.Context;
+import org.restlet.ext.servlet.ServerServlet;
+
+/**
+ * Integration with Polygene. Register an object extending Application to use.
+ */
+public class PolygeneServerServlet
+ extends ServerServlet
+{
+ @Structure
+ Module module;
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ protected Application createApplication( Context context )
+ {
+ return module.newObject( Application.class, context.createChildContext(), getServletConfig(), getServletContext() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
new file mode 100644
index 0000000..16cf511
--- /dev/null
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/PolygeneServerServletService.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.library.rest.admin;
+
+import javax.servlet.Servlet;
+import org.apache.polygene.api.mixin.Mixins;
+import org.apache.polygene.api.service.ServiceComposite;
+
+/**
+ * JAVADOC
+ */
+@Mixins( PolygeneServerServlet.class )
+public interface PolygeneServerServletService
+ extends Servlet, ServiceComposite
+{
+}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestFinder.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestFinder.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestFinder.java
deleted file mode 100644
index b261ed3..0000000
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestFinder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rest.admin;
-
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.object.ObjectFactory;
-import org.restlet.Request;
-import org.restlet.Response;
-import org.restlet.resource.Finder;
-import org.restlet.resource.ServerResource;
-
-public class PolygeneFinder
- extends Finder
-{
- @Structure
- private ObjectFactory factory;
-
- public PolygeneFinder()
- {
- }
-
- @Override
- public ServerResource create( Class<? extends ServerResource> targetClass, Request request, Response response )
- {
- return factory.newObject( targetClass );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServlet.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServlet.java
deleted file mode 100644
index f9e2490..0000000
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServlet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rest.admin;
-
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.structure.Module;
-import org.restlet.Application;
-import org.restlet.Context;
-import org.restlet.ext.servlet.ServerServlet;
-
-/**
- * Integration with Polygene. Register an object extending Application to use.
- */
-public class PolygeneServerServlet
- extends ServerServlet
-{
- @Structure
- Module module;
-
- @Override
- @SuppressWarnings( "unchecked" )
- protected Application createApplication( Context context )
- {
- return module.newObject( Application.class, context.createChildContext(), getServletConfig(), getServletContext() );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServletService.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServletService.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServletService.java
deleted file mode 100644
index 16cf511..0000000
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/ZestServerServletService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.rest.admin;
-
-import javax.servlet.Servlet;
-import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceComposite;
-
-/**
- * JAVADOC
- */
-@Mixins( PolygeneServerServlet.class )
-public interface PolygeneServerServletService
- extends Servlet, ServiceComposite
-{
-}