You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2017/07/17 12:45:53 UTC
[01/50] [abbrv] polygene-java git commit: Fixed another bug that
caused some polygene generator build failures.. Is those disabled in Jenkins,
or why didn't it show up in the CI?
Repository: polygene-java
Updated Branches:
refs/heads/develop ae9506a31 -> c8b40a213
refs/heads/master 7db51ad00 -> 6f4e6667a
Updated Tags: refs/tags/3.0.0-RC2 [created] 38abe28b6
Fixed another bug that caused some polygene generator build failures.. Is those disabled in Jenkins, or why didn't it show up in the CI?
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/d22dc29e
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/d22dc29e
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/d22dc29e
Branch: refs/heads/master
Commit: d22dc29edd7b66fec9c9eff5628061e6b52b0d95
Parents: 52f36f3
Author: niclas <ni...@hedhman.org>
Authored: Fri Jun 30 13:53:00 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Jun 30 13:53:00 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/index.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d22dc29e/tools/generator-polygene/app/index.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/index.js b/tools/generator-polygene/app/index.js
index 8cbd9fd..bcb7453 100644
--- a/tools/generator-polygene/app/index.js
+++ b/tools/generator-polygene/app/index.js
@@ -203,6 +203,7 @@ module.exports = generators.Base.extend(
polygene.features = answers.features;
polygene.indexing = answers.indexing;
polygene.entitystore = answers.entitystore;
+ polygene.dbpool = answers.dbpool;
polygene.metrics = answers.metrics;
polygene.caching = answers.caching;
}.bind(this)
[13/50] [abbrv] polygene-java git commit: Exclude txt files that are
copied verbatim to generated project and should not have license headers.
Posted by pa...@apache.org.
Exclude txt files that are copied verbatim to generated project and should not have license headers.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/0665d56d
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/0665d56d
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/0665d56d
Branch: refs/heads/master
Commit: 0665d56d6432800226196d9deb9b610661841c7e
Parents: bc0a510
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 11:03:39 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 11:03:39 2017 +0800
----------------------------------------------------------------------
.../gradle/structure/distributions/DistributionsPlugin.groovy | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0665d56d/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index f6eee1f..1fa7936 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -165,6 +165,10 @@ class DistributionsPlugin implements Plugin<Project>
spec.exclude '**/.nb-gradle/**' // Netbeans files
spec.exclude '**/.nb-gradle*' // Netbeans files
+ // Polygene Generator files
+ spec.exclude '**/customUnixStartScript.txt'
+ spec.exclude '**/customWindowsStartScript.txt'
+
spec.into '.'
}
def srcDistSupplementaryFilesCopySpec = project.copySpec { CopySpec spec ->
[04/50] [abbrv] polygene-java git commit: Fixing the restlet library
in relation to the polygene generator to work.
Posted by pa...@apache.org.
Fixing the restlet library in relation to the polygene generator to work.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c6b89168
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c6b89168
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c6b89168
Branch: refs/heads/master
Commit: c6b89168f155bb55d8af892d088b8977d9e26834
Parents: ed6ae81
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 2 14:08:40 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 2 14:08:40 2017 +0800
----------------------------------------------------------------------
.../polygene/runtime/value/ValueInstance.java | 18 ++++-
libraries/restlet/build.gradle | 5 +-
.../library/restlet/PolygeneEntityRestlet.java | 1 -
.../restlet/PolygeneRestApplication.java | 36 ++++++---
.../library/restlet/PolygeneServerServlet.java | 13 ++-
.../restlet/assembly/GenericRestLayer.java | 34 --------
.../assembly/RestApplicationAssembler.java | 85 --------------------
.../RestletCrudConnectivityAssembler.java | 3 +
.../assembly/RestletCrudModuleAssembler.java | 23 ++++--
.../configuration/ConfigurationLayer.java | 45 -----------
.../configuration/ConfigurationModule.java | 39 ---------
.../connectivity/ConnectivityLayer.java | 39 ---------
.../assembly/connectivity/RestModule.java | 40 ---------
.../assembly/connectivity/SecurityModule.java | 35 --------
.../restlet/assembly/domain/CrudModule.java | 38 ---------
.../restlet/assembly/domain/DomainLayer.java | 37 ---------
.../infrastructue/FileStorageModule.java | 50 ------------
.../assembly/infrastructue/IndexingModule.java | 54 -------------
.../infrastructue/InfrastructureLayer.java | 54 -------------
.../infrastructue/SerializationModule.java | 37 ---------
.../assembly/resource/ResourceLayer.java | 37 ---------
.../restlet/crud/EntityListResource.java | 5 +-
.../library/restlet/crud/EntityResource.java | 13 +--
.../restlet/resource/CreationResource.java | 8 +-
.../restlet/resource/EntryPointResource.java | 4 +-
.../restlet/resource/ResourceBuilder.java | 32 ++++----
.../serialization/JsonRepresentation.java | 7 +-
.../library/restlet/TestApplication.java | 10 +--
.../assembly/RestApplicationAssembler.java | 85 ++++++++++++++++++++
.../configuration/ConfigurationLayer.java | 45 +++++++++++
.../configuration/ConfigurationModule.java | 39 +++++++++
.../connectivity/ConnectivityLayer.java | 39 +++++++++
.../assembly/connectivity/RestModule.java | 40 +++++++++
.../assembly/connectivity/SecurityModule.java | 35 ++++++++
.../restlet/assembly/domain/CrudModule.java | 38 +++++++++
.../restlet/assembly/domain/DomainLayer.java | 37 +++++++++
.../infrastructue/FileStorageModule.java | 50 ++++++++++++
.../assembly/infrastructue/IndexingModule.java | 54 +++++++++++++
.../infrastructue/InfrastructureLayer.java | 54 +++++++++++++
.../infrastructue/SerializationModule.java | 37 +++++++++
.../assembly/resource/ResourceLayer.java | 37 +++++++++
.../HttpServerModule/bootstrap.tmpl | 7 +-
.../RestApiModule/NullEnroler.tmpl | 32 --------
.../RestApiModule/NullVerifier.tmpl | 34 --------
.../RestApiModule/bootstrap.tmpl | 10 +--
.../ConnectivityLayer/RestApiModule/module.js | 4 -
.../DomainLayer/DomainModule/bootstrap.tmpl | 8 +-
.../RestAPIApplication/application.java.tmpl | 32 +++++---
.../app/templates/buildtool/gradle-app.tmpl | 22 ++---
.../app/templates/buildtool/gradle-root.tmpl | 27 +++++++
50 files changed, 761 insertions(+), 807 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
index 5e678c5..8af2e08 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
@@ -20,6 +20,7 @@
package org.apache.polygene.runtime.value;
import java.lang.reflect.Proxy;
+import java.util.Arrays;
import org.apache.polygene.api.composite.CompositeInstance;
import org.apache.polygene.api.serialization.Serializer;
import org.apache.polygene.runtime.composite.MixinsInstance;
@@ -144,10 +145,23 @@ public final class ValueInstance extends TransientInstance
return hash + state.hashCode() * 5; // State
}
+ public String toJsonString()
+ {
+ Serializer serialization = ( (ModuleSpi) module().instance() ).serialization();
+ if( serialization != null )
+ {
+ return serialization.serialize( Serializer.Options.NO_TYPE_INFO, proxy() );
+ }
+ return null;
+ }
+
@Override
public String toString()
{
- Serializer serialization = ( (ModuleSpi) module().instance() ).serialization();
- return serialization.serialize( Serializer.Options.NO_TYPE_INFO, proxy() );
+ return "ValueInstance{" +
+ "mixins=" + Arrays.toString( mixins ) +
+ ", state=" + state +
+ ", compositeModel=" + compositeModel +
+ '}';
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/restlet/build.gradle b/libraries/restlet/build.gradle
index 95ab44b..7a8705c 100644
--- a/libraries/restlet/build.gradle
+++ b/libraries/restlet/build.gradle
@@ -30,8 +30,6 @@ dependencies {
api polygene.core.bootstrap
- implementation polygene.extension( 'entitystore-file' )
- implementation polygene.extension( 'indexing-rdf' )
implementation libraries.restlet
runtimeOnly polygene.core.runtime
@@ -39,7 +37,8 @@ dependencies {
testImplementation polygene.core.testsupport
testImplementation polygene.library( 'http' )
testImplementation libraries.http_client
-
+ testImplementation polygene.extension( 'entitystore-file' )
+ testImplementation polygene.extension( 'indexing-rdf' )
testRuntimeOnly libraries.logback
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
index b76bfd3..da27d9e 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneEntityRestlet.java
@@ -152,7 +152,6 @@ public class PolygeneEntityRestlet<T extends HasIdentity> extends Restlet
}
Representation representation = converter.toRepresentation( result, new Variant(), null );
response.setEntity( representation );
- response.setEntity( representation );
response.setStatus( Status.SUCCESS_OK );
}
else
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
index 854592e..0bfd614 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplication.java
@@ -33,6 +33,7 @@ import org.apache.polygene.library.restlet.resource.EntryPointResource;
import org.apache.polygene.library.restlet.resource.ResourceFactory;
import org.apache.polygene.library.restlet.resource.ServerResource;
import org.apache.polygene.library.restlet.serialization.PolygeneConverter;
+import org.restlet.Component;
import org.restlet.Context;
import org.restlet.Restlet;
import org.restlet.data.ChallengeScheme;
@@ -59,10 +60,12 @@ public abstract class PolygeneRestApplication extends org.restlet.Application
protected ObjectFactory objectFactory;
protected Router router;
+ protected String basePath;
- protected PolygeneRestApplication( Context context )
+ protected PolygeneRestApplication( String basePath, Context context )
{
super( context );
+ this.basePath = basePath;
}
protected void printRoutes( PrintStream out )
@@ -105,25 +108,34 @@ public abstract class PolygeneRestApplication extends org.restlet.Application
router = new Router( context );
addRoutes( router );
- router.attach( "/", newPolygeneRestlet( EntryPointResource.class, EntryPoint.class ) );
-
- ChallengeAuthenticator guard = new ChallengeAuthenticator( context, ChallengeScheme.HTTP_BASIC, getName() + " Realm" );
+ router.attach( basePath, newPolygeneRestlet( EntryPointResource.class, EntryPoint.class ) );
Verifier verifier = createVerifier();
- if( verifier != null )
+ Enroler enroler = createEnroler();
+ if( verifier == null && enroler == null )
{
- guard.setVerifier( verifier );
+ return createInterceptors(new Filter()
+ {
+ } );
}
-
- Enroler enroler = createEnroler();
- if( enroler != null )
+ else
{
- guard.setEnroler( enroler );
+ ChallengeAuthenticator guard = new ChallengeAuthenticator( context, ChallengeScheme.HTTP_BASIC, getName() + " Realm" );
+
+ if( verifier != null )
+ {
+ guard.setVerifier( verifier );
+ }
+
+ if( enroler != null )
+ {
+ guard.setEnroler( enroler );
+ }
+ return createInterceptors( guard );
}
- return createInterceptors( guard );
}
- private Restlet createInterceptors( ChallengeAuthenticator guard )
+ private Restlet createInterceptors( Filter guard )
{
Filter inner = createInnerInterceptor();
if( inner != null )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
index ce5cf03..4d2c125 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
@@ -19,12 +19,16 @@
*/
package org.apache.polygene.library.restlet;
+import java.util.List;
import javax.servlet.Servlet;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.mixin.Mixins;
+import org.apache.polygene.api.object.ObjectFactory;
import org.apache.polygene.api.structure.Module;
import org.restlet.Context;
import org.restlet.ext.servlet.ServerServlet;
+import org.restlet.routing.VirtualHost;
+import org.restlet.util.ServerList;
/**
* Restlet ServerServlet backed by a org.restlet.Application object.
@@ -32,16 +36,17 @@ import org.restlet.ext.servlet.ServerServlet;
@Mixins( PolygeneServerServlet.Mixin.class )
public interface PolygeneServerServlet extends Servlet
{
- class Mixin
- extends ServerServlet
+ class Mixin extends ServerServlet
{
@Structure
- private Module module;
+ private ObjectFactory objectFactory;
@Override
protected org.restlet.Application createApplication( Context parentContext )
{
- return module.newObject( org.restlet.Application.class, parentContext.createChildContext() );
+ ServerList servers = getComponent().getServers();
+ System.out.println(servers);
+ return objectFactory.newObject( PolygeneRestApplication.class, parentContext.createChildContext() );
}
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.java
deleted file mode 100644
index bbe10ab..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/GenericRestLayer.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.restlet.assembly;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class GenericRestLayer extends LayeredLayerAssembler
-{
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
deleted file mode 100644
index c520e75..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
+++ /dev/null
@@ -1,85 +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.restlet.assembly;
-
-import java.util.LinkedHashMap;
-import java.util.function.BinaryOperator;
-import org.apache.polygene.api.activation.PassivationException;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredApplicationAssembler;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-public class RestApplicationAssembler extends LayeredApplicationAssembler
-{
- private final LinkedHashMap<Class<? extends LayerAssembler>, LayerAssembly> assemblies = new LinkedHashMap<>();
- private Class<? extends LayerAssembler>[] layers;
-
- @SafeVarargs
- public RestApplicationAssembler( String name, String version, Application.Mode mode, Class<? extends LayerAssembler>... layers )
- throws AssemblyException
- {
- super( name, version, mode );
- this.layers = layers;
- }
-
- @Override
- protected void assembleLayers( ApplicationAssembly assembly )
- {
- for( Class<? extends LayerAssembler> layer : layers )
- {
- LayerAssembly layerAssembly = createLayer( layer );
- assemblies.put( layer, layerAssembly );
- }
- }
-
- public void setupUses( BinaryOperator<LayerAssembly> uses )
- {
- assemblies.values().stream().reduce( uses );
- }
-
- public void setupUses()
- {
- assemblies.values().stream().reduce( LayerAssembly::uses );
- }
-
- public LayerAssembly layer( Class<? extends LayerAssembler> layerClass, ModuleAssembler... assemblers )
- {
- return assemblies.get( layerClass );
- }
-
- public void addShutdownHook()
- {
- Runtime.getRuntime().addShutdownHook( new Thread( () -> {
- try
- {
- stop();
- }
- catch( PassivationException e )
- {
- e.printStackTrace();
- }
- } ) );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
index 6da0361..0eb1d5e 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
@@ -38,6 +38,9 @@ import org.apache.polygene.library.restlet.resource.ResourceBuilder;
import org.apache.polygene.library.restlet.serialization.FormRepresentation;
import org.apache.polygene.library.restlet.serialization.JsonRepresentation;
+/** This assembler should go to a module in the layer of the {@link RestletCrudModuleAssembler}.
+ *
+ */
public class RestletCrudConnectivityAssembler
implements Assembler
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
index 562586f..490804b 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
@@ -22,14 +22,17 @@ package org.apache.polygene.library.restlet.assembly;
import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.api.unitofwork.concern.UnitOfWorkConcern;
-import org.apache.polygene.bootstrap.Assembler;
+import org.apache.polygene.bootstrap.Assemblers;
import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.ServiceDeclaration;
import org.apache.polygene.library.restlet.repository.CrudRepository;
import org.apache.polygene.library.restlet.repository.EntityTypeDescriptor;
import org.apache.polygene.library.restlet.repository.SmallCrudRepositoryMixin;
-public class RestletCrudModuleAssembler
- implements Assembler
+/**
+ * This assembler should be used for each module that has CRUD types, reachable by the REST API.
+ */
+public class RestletCrudModuleAssembler extends Assemblers.VisibilityIdentity<RestletCrudModuleAssembler>
{
private final Class type;
private final Class repositoryType;
@@ -49,15 +52,21 @@ public class RestletCrudModuleAssembler
@Override
public void assemble( ModuleAssembly module )
{
- module
+ ServiceDeclaration declaration = module
.addServices( repositoryType )
- .identifiedBy( "repository_" + type.getSimpleName() )
.visibleIn( Visibility.application )
.withMixins( SmallCrudRepositoryMixin.class )
.withConcerns( UnitOfWorkConcern.class )
.taggedWith( type.getSimpleName() )
- .setMetaInfo( new EntityTypeDescriptor( type ) )
- ;
+ .setMetaInfo( new EntityTypeDescriptor( type ) );
+ if( hasIdentity() )
+ {
+ declaration.identifiedBy( identity() );
+ }
+ else
+ {
+ declaration.identifiedBy( "repository_" + type.getSimpleName() );
+ }
module.entities( type ).visibleIn( Visibility.layer );
module.values( type ).visibleIn( Visibility.layer );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
deleted file mode 100644
index e615347..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.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.restlet.assembly.configuration;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class ConfigurationLayer extends LayeredLayerAssembler
- implements LayerAssembler
-{
- public static final String NAME = "Configuration Layer";
- private ModuleAssembly configModule;
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- configModule = createModule( layer, ConfigurationModule.class );
- return layer;
- }
-
- public ModuleAssembly configModule()
- {
- return configModule;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
deleted file mode 100644
index dd65cfa..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.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.restlet.assembly.configuration;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
-
-public class ConfigurationModule
- implements ModuleAssembler
-{
- public static final String NAME = "Configuration Module";
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
deleted file mode 100644
index c0d45dc..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.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.restlet.assembly.connectivity;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class ConnectivityLayer extends LayeredLayerAssembler
- implements LayerAssembler
-{
- public static final String NAME = "Connectivity Layer";
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- createModule( layer, RestModule.class );
- createModule( layer, SecurityModule.class );
- return layer;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
deleted file mode 100644
index 29349f5..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
+++ /dev/null
@@ -1,40 +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.restlet.assembly.connectivity;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.library.restlet.assembly.RestletCrudConnectivityAssembler;
-import org.apache.polygene.library.restlet.resource.EntryPoint;
-
-public class RestModule
- implements ModuleAssembler
-{
- public static final String NAME = "REST Module";
-
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- new RestletCrudConnectivityAssembler().assemble( module );
- module.values( EntryPoint.class );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
deleted file mode 100644
index 02ca63f..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
+++ /dev/null
@@ -1,35 +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.restlet.assembly.connectivity;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-public class SecurityModule
- implements ModuleAssembler
-{
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
deleted file mode 100644
index 769390b..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
+++ /dev/null
@@ -1,38 +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.restlet.assembly.domain;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.library.restlet.assembly.CrudServiceAssembler;
-
-public class CrudModule
- implements ModuleAssembler
-{
- public static final String NAME = "CRUD Module";
-
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- new CrudServiceAssembler().assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
deleted file mode 100644
index 9fe73f3..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
+++ /dev/null
@@ -1,37 +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.restlet.assembly.domain;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class DomainLayer extends LayeredLayerAssembler
- implements LayerAssembler
-{
- public static final String NAME = "Domain Layer";
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- createModule( layer, CrudModule.class );
- return layer;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
deleted file mode 100644
index 4d410f7..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
+++ /dev/null
@@ -1,50 +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.restlet.assembly.infrastructue;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.entitystore.file.assembly.FileEntityStoreAssembler;
-
-public class FileStorageModule
- implements ModuleAssembler
-{
- public static final String NAME = "Storage Module";
-
- private final ModuleAssembly configModule;
-
- public FileStorageModule( ModuleAssembly configModule )
- {
- this.configModule = configModule;
- }
-
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- new FileEntityStoreAssembler()
- .visibleIn( Visibility.application )
- .withConfig( configModule, Visibility.application )
- .assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
deleted file mode 100644
index 9977b93..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
+++ /dev/null
@@ -1,54 +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.restlet.assembly.infrastructue;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler;
-import org.apache.polygene.library.rdf.repository.NativeConfiguration;
-
-public class IndexingModule
- implements ModuleAssembler
-{
- public static final String NAME = "Indexing Module";
- private final ModuleAssembly configModule;
-
- public IndexingModule( ModuleAssembly configModule )
- {
- this.configModule = configModule;
- }
-
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
-// new FileConfigurationAssembler().assemble( module );
-// new ESFilesystemIndexQueryAssembler()
-// .visibleIn( Visibility.application )
-// .withConfig( configModule, Visibility.application )
-// .assemble( module );
-
- configModule.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
- new RdfNativeSesameStoreAssembler(Visibility.application, Visibility.module).assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
deleted file mode 100644
index 7d98ff3..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
+++ /dev/null
@@ -1,54 +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.restlet.assembly.infrastructue;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;
-import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;
-
-public class InfrastructureLayer extends LayeredLayerAssembler
- implements LayerAssembler
-{
- public static final String NAME = "Infrastructure Layer";
- private final ModuleAssembly configModule;
-
- public static InfrastructureLayer create( LayerAssembly layer )
- {
- ModuleAssembly config = layer.application().layer( ConfigurationLayer.NAME ).module( ConfigurationModule.NAME );
- return new InfrastructureLayer( config );
- }
-
- public InfrastructureLayer( ModuleAssembly configModule )
- {
- this.configModule = configModule;
- }
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );
- new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );
- return layer;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
deleted file mode 100644
index 85bb76d..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
+++ /dev/null
@@ -1,37 +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.restlet.assembly.infrastructue;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-
-public class SerializationModule
- implements ModuleAssembler
-{
- public static final String NAME = "Serialization Module";
-
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- {
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
deleted file mode 100644
index a209315..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
+++ /dev/null
@@ -1,37 +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.restlet.assembly.resource;
-
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.layered.LayerAssembler;
-import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
-
-public class ResourceLayer extends LayeredLayerAssembler
- implements LayerAssembler
-{
- public static final String NAME = "Resource Layer";
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- return layer;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
index 6085c22..175ee7c 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityListResource.java
@@ -93,13 +93,10 @@ public interface EntityListResource<T extends HasIdentity> extends ServerResourc
name = nameField.value().get();
}
Reference base = parameters.request().get().getResourceRef();
-
- //noinspection unchecked
Class<T> entityType = parameters.entityType().get();
-
Identity identity = identityManager.generate(entityType, name);
locator.find( entityType ).create( identity );
- return resourceBuilder.createRestLink( identity, base, Method.GET );
+ return resourceBuilder.createRestLink( identity.toString(), base, Method.GET );
}
@SuppressWarnings( "unchecked" )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
index 965a33a..91b05ea 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityResource.java
@@ -40,7 +40,6 @@ import org.apache.polygene.library.restlet.RestLink;
import org.apache.polygene.library.restlet.repository.RepositoryLocator;
import org.apache.polygene.library.restlet.resource.ResourceBuilder;
import org.apache.polygene.library.restlet.resource.ServerResource;
-import org.apache.polygene.spi.PolygeneSPI;
import org.restlet.data.Reference;
@Mixins( EntityResource.Mixin.class )
@@ -57,15 +56,9 @@ public interface EntityResource<T extends HasIdentity> extends ServerResource<T>
{
@Structure
- private PolygeneSPI spi;
-
- @Structure
private ValueBuilderFactory vbf;
@This
- private HasIdentity me;
-
- @This
private Parameters<T> parameters;
@This
@@ -95,7 +88,7 @@ public interface EntityResource<T extends HasIdentity> extends ServerResource<T>
@Override
public void delete()
{
- Class entityType = parameters.entityType().get();
+ Class<? extends HasIdentity> entityType = parameters.entityType().get();
String idOfEntity = parameters.id().get();
locator.find( entityType ).delete( StringIdentity.identityOf( idOfEntity ) );
}
@@ -137,10 +130,10 @@ public interface EntityResource<T extends HasIdentity> extends ServerResource<T>
throw new RuntimeException( message, e );
}
Reference base = parameters.request().get().getResourceRef();
- return resourceBuilder.createRestLink( StringIdentity.identityOf( "" ), base, org.restlet.data.Method.GET );
+ return resourceBuilder.createRestLink( "", base, org.restlet.data.Method.GET );
}
- private Object createParametersComposite( RestForm form, Class argType )
+ private Object createParametersComposite( RestForm form, Class<?> argType )
{
ValueBuilder<?> vb = vbf.newValueBuilderWithState(
argType,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
index fe86473..cee4b23 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/CreationResource.java
@@ -66,11 +66,11 @@ public interface CreationResource<T extends HasIdentity> extends ServerResource<
public RestLink post( RestForm form )
{
String name = form.field( "name" ).value().get();
- Class entityType = parameters.entityType().get();
+ Class<? extends HasIdentity> entityType = parameters.entityType().get();
Identity identity = identityManager.generate( entityType, name );
locator.find( entityType ).create( identity );
doParameterization( form, entityType, identity );
- return resourceBuilder.createRestLink( identity, parameters.request().get().getResourceRef(), Method.GET );
+ return resourceBuilder.createRestLink( identity.toString(), parameters.request().get().getResourceRef(), Method.GET );
}
private <P> void doParameterization( RestForm form, Class entityType, Identity identity )
@@ -79,7 +79,7 @@ public interface CreationResource<T extends HasIdentity> extends ServerResource<
{
return;
}
- //noinspection unchecked
+ @SuppressWarnings( "unchecked" )
CreationParameterized<P> created = (CreationParameterized<P>) locator.find( entityType ).get( identity );
P parameterization = createParameterizationValue( form, created );
created.parameterize( parameterization );
@@ -94,7 +94,7 @@ public interface CreationResource<T extends HasIdentity> extends ServerResource<
association -> null,
association -> null,
association -> null
- );
+ );
return vb.newInstance();
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
index b497ebd..2e56c8a 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPointResource.java
@@ -80,11 +80,11 @@ public interface EntryPointResource extends ServerResource<EntryPoint>
RestLink link;
if( route.getDescription() == null )
{
- link = resourceBuilder.createRestLink( StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET );
+ link = resourceBuilder.createRestLink( template.getPattern(), hostRef, Method.GET );
}
else
{
- link = resourceBuilder.createRestLink( StringIdentity.identityOf( template.getPattern() ), hostRef, Method.GET, route.getDescription() );
+ link = resourceBuilder.createRestLink( template.getPattern(), hostRef, Method.GET, route.getDescription() );
}
entryPoints.put( route.getName(), link );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
index be851a6..fded105 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceBuilder.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.Collections;
import org.apache.polygene.api.identity.HasIdentity;
import org.apache.polygene.api.identity.Identity;
-import org.apache.polygene.api.identity.StringIdentity;
import org.apache.polygene.api.injection.scope.Service;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.mixin.Mixins;
@@ -48,13 +47,13 @@ import org.restlet.routing.Router;
@Mixins( ResourceBuilder.Mixin.class )
public interface ResourceBuilder
{
- EntityRef createEntityRef(Identity name, Reference base );
+ EntityRef createEntityRef( Identity name, Reference base );
EntityRef createEntityRef( Identity name, RestLink get, RestLink put, RestLink delete );
- RestLink createRestLink( Identity name, Reference base, Method method );
+ RestLink createRestLink( String name, Reference base, Method method );
- RestLink createRestLink( Identity name, Reference base, Method method, String description );
+ RestLink createRestLink( String name, Reference base, Method method, String description );
Command createCommand( Reference base );
@@ -62,9 +61,9 @@ public interface ResourceBuilder
FormField createFormField( String name, String type );
- <T extends HasIdentity> Representation toRepresentation(Class<T> type, T composite );
+ <T extends HasIdentity> Representation toRepresentation( Class<T> type, T composite );
- <T extends HasIdentity> T toObject(Class<T> type, Representation representation )
+ <T extends HasIdentity> T toObject( Class<T> type, Representation representation )
throws IOException;
Route findRoute( String name, Router router );
@@ -88,9 +87,11 @@ public interface ResourceBuilder
@Override
public EntityRef createEntityRef( Identity identity, Reference base )
{
- RestLink get = createRestLink( identity, base, Method.GET );
- RestLink put = createRestLink( identity, base, Method.PUT );
- RestLink delete = createRestLink( identity, base, Method.DELETE );
+ String name = identityManager.extractName( identity );
+
+ RestLink get = createRestLink( name, base, Method.GET );
+ RestLink put = createRestLink( name, base, Method.PUT );
+ RestLink delete = createRestLink( name, base, Method.DELETE );
return createEntityRef( identity, get, put, delete );
}
@@ -107,10 +108,8 @@ public interface ResourceBuilder
}
@Override
- public RestLink createRestLink( Identity identity, Reference base, Method method )
+ public RestLink createRestLink( String name, Reference base, Method method )
{
- String name = identityManager.extractName( identity );
-
ValueBuilder<RestLink> builder = vbf.newValueBuilder( RestLink.class );
RestLink prototype = builder.prototype();
String path = base.toUri().resolve( name ).getPath();
@@ -120,9 +119,8 @@ public interface ResourceBuilder
}
@Override
- public RestLink createRestLink( Identity identity, Reference base, Method method, String description )
+ public RestLink createRestLink( String name, Reference base, Method method, String description )
{
- String name = identityManager.extractName( identity );
ValueBuilder<RestLink> builder = vbf.newValueBuilder( RestLink.class );
RestLink prototype = builder.prototype();
prototype.path().set( base.toUri().resolve( name ).getPath() + "/" );
@@ -143,7 +141,7 @@ public interface ResourceBuilder
public RestForm createNameForm( Reference base )
{
ValueBuilder<RestForm> builder = vbf.newValueBuilder( RestForm.class );
- builder.prototype().link().set( createRestLink( StringIdentity.identityOf( "form" ), base, Method.POST ) );
+ builder.prototype().link().set( createRestLink( "form", base, Method.POST ) );
builder.prototype().fields().set( Collections.singletonList( createFormField( "name", FormField.TEXT ) ) );
return builder.newInstance();
}
@@ -157,13 +155,13 @@ public interface ResourceBuilder
}
@Override
- public <T extends HasIdentity> Representation toRepresentation(Class<T> type, T composite )
+ public <T extends HasIdentity> Representation toRepresentation( Class<T> type, T composite )
{
return converter.toRepresentation( composite, new Variant(), null );
}
@Override
- public <T extends HasIdentity> T toObject(Class<T> type, Representation representation )
+ public <T extends HasIdentity> T toObject( Class<T> type, Representation representation )
throws IOException
{
return converter.toObject( representation, type, null );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
index ea0929b..fafabe4 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
@@ -23,12 +23,12 @@ package org.apache.polygene.library.restlet.serialization;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import org.apache.polygene.api.common.Optional;
import org.apache.polygene.api.injection.scope.Service;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.injection.scope.Uses;
import org.apache.polygene.api.serialization.Serialization;
+import org.apache.polygene.api.serialization.Serializer;
import org.apache.polygene.api.structure.ModuleDescriptor;
import org.apache.polygene.spi.PolygeneSPI;
import org.restlet.data.MediaType;
@@ -84,7 +84,7 @@ public class JsonRepresentation<T> extends OutputRepresentation
*
* @return The wrapped object.
*
- * @throws IOException
+ * @throws IOException if there is an underlying I/O problem.
*/
public T getObject()
throws IOException
@@ -123,8 +123,7 @@ public class JsonRepresentation<T> extends OutputRepresentation
}
else if( object != null )
{
- // TODO was WITHOUT TYPE INFO
- stateSerialization.serialize( new OutputStreamWriter( outputStream ), object );
+ stateSerialization.serialize( Serializer.Options.NO_TYPE_INFO, outputStream, object );
outputStream.write( '\n' );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
index 6d21d05..3b8fb2b 100644
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
@@ -45,11 +45,11 @@ public class TestApplication
throws Exception
{
RestApplicationAssembler assembler = new RestApplicationAssembler( NAME, VERSION, MODE,
- ConfigurationLayer.class,
- InfrastructureLayer.class,
- DomainLayer.class,
- ResourceLayer.class,
- ConnectivityLayer.class
+ ConnectivityLayer.class,
+ ResourceLayer.class,
+ DomainLayer.class,
+ InfrastructureLayer.class,
+ ConfigurationLayer.class
);
assembler.initialize();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
new file mode 100644
index 0000000..c520e75
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
@@ -0,0 +1,85 @@
+/*
+ * 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.restlet.assembly;
+
+import java.util.LinkedHashMap;
+import java.util.function.BinaryOperator;
+import org.apache.polygene.api.activation.PassivationException;
+import org.apache.polygene.api.structure.Application;
+import org.apache.polygene.bootstrap.ApplicationAssembly;
+import org.apache.polygene.bootstrap.AssemblyException;
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredApplicationAssembler;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+
+public class RestApplicationAssembler extends LayeredApplicationAssembler
+{
+ private final LinkedHashMap<Class<? extends LayerAssembler>, LayerAssembly> assemblies = new LinkedHashMap<>();
+ private Class<? extends LayerAssembler>[] layers;
+
+ @SafeVarargs
+ public RestApplicationAssembler( String name, String version, Application.Mode mode, Class<? extends LayerAssembler>... layers )
+ throws AssemblyException
+ {
+ super( name, version, mode );
+ this.layers = layers;
+ }
+
+ @Override
+ protected void assembleLayers( ApplicationAssembly assembly )
+ {
+ for( Class<? extends LayerAssembler> layer : layers )
+ {
+ LayerAssembly layerAssembly = createLayer( layer );
+ assemblies.put( layer, layerAssembly );
+ }
+ }
+
+ public void setupUses( BinaryOperator<LayerAssembly> uses )
+ {
+ assemblies.values().stream().reduce( uses );
+ }
+
+ public void setupUses()
+ {
+ assemblies.values().stream().reduce( LayerAssembly::uses );
+ }
+
+ public LayerAssembly layer( Class<? extends LayerAssembler> layerClass, ModuleAssembler... assemblers )
+ {
+ return assemblies.get( layerClass );
+ }
+
+ public void addShutdownHook()
+ {
+ Runtime.getRuntime().addShutdownHook( new Thread( () -> {
+ try
+ {
+ stop();
+ }
+ catch( PassivationException e )
+ {
+ e.printStackTrace();
+ }
+ } ) );
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.java
new file mode 100644
index 0000000..e615347
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationLayer.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.restlet.assembly.configuration;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
+
+public class ConfigurationLayer extends LayeredLayerAssembler
+ implements LayerAssembler
+{
+ public static final String NAME = "Configuration Layer";
+ private ModuleAssembly configModule;
+
+ @Override
+ public LayerAssembly assemble( LayerAssembly layer )
+ {
+ configModule = createModule( layer, ConfigurationModule.class );
+ return layer;
+ }
+
+ public ModuleAssembly configModule()
+ {
+ return configModule;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.java
new file mode 100644
index 0000000..dd65cfa
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.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.restlet.assembly.configuration;
+
+import org.apache.polygene.api.common.Visibility;
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
+
+public class ConfigurationModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "Configuration Module";
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ module.services( MemoryEntityStoreService.class ).visibleIn( Visibility.layer );
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.java
new file mode 100644
index 0000000..c0d45dc
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/ConnectivityLayer.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.restlet.assembly.connectivity;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
+
+public class ConnectivityLayer extends LayeredLayerAssembler
+ implements LayerAssembler
+{
+ public static final String NAME = "Connectivity Layer";
+
+ @Override
+ public LayerAssembly assemble( LayerAssembly layer )
+ {
+ createModule( layer, RestModule.class );
+ createModule( layer, SecurityModule.class );
+ return layer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
new file mode 100644
index 0000000..29349f5
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/RestModule.java
@@ -0,0 +1,40 @@
+/*
+ * 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.restlet.assembly.connectivity;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.library.restlet.assembly.RestletCrudConnectivityAssembler;
+import org.apache.polygene.library.restlet.resource.EntryPoint;
+
+public class RestModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "REST Module";
+
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ new RestletCrudConnectivityAssembler().assemble( module );
+ module.values( EntryPoint.class );
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
new file mode 100644
index 0000000..02ca63f
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/connectivity/SecurityModule.java
@@ -0,0 +1,35 @@
+/*
+ * 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.restlet.assembly.connectivity;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+
+public class SecurityModule
+ implements ModuleAssembler
+{
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
new file mode 100644
index 0000000..769390b
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.java
@@ -0,0 +1,38 @@
+/*
+ * 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.restlet.assembly.domain;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.library.restlet.assembly.CrudServiceAssembler;
+
+public class CrudModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "CRUD Module";
+
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ new CrudServiceAssembler().assemble( module );
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
new file mode 100644
index 0000000..9fe73f3
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.java
@@ -0,0 +1,37 @@
+/*
+ * 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.restlet.assembly.domain;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
+
+public class DomainLayer extends LayeredLayerAssembler
+ implements LayerAssembler
+{
+ public static final String NAME = "Domain Layer";
+
+ @Override
+ public LayerAssembly assemble( LayerAssembly layer )
+ {
+ createModule( layer, CrudModule.class );
+ return layer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
new file mode 100644
index 0000000..4d410f7
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
@@ -0,0 +1,50 @@
+/*
+ * 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.restlet.assembly.infrastructue;
+
+import org.apache.polygene.api.common.Visibility;
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.entitystore.file.assembly.FileEntityStoreAssembler;
+
+public class FileStorageModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "Storage Module";
+
+ private final ModuleAssembly configModule;
+
+ public FileStorageModule( ModuleAssembly configModule )
+ {
+ this.configModule = configModule;
+ }
+
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ new FileEntityStoreAssembler()
+ .visibleIn( Visibility.application )
+ .withConfig( configModule, Visibility.application )
+ .assemble( module );
+ return module;
+ }
+}
[47/50] [abbrv] polygene-java git commit: Artificially remove
indexing-sql and generator-polygene from the release
Posted by pa...@apache.org.
Artificially remove indexing-sql and generator-polygene from the release
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/357eb4e7
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/357eb4e7
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/357eb4e7
Branch: refs/heads/master
Commit: 357eb4e74d019b00a83acc4b67112eb652b4c5de
Parents: ae9506a
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 13:51:30 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 13:51:30 2017 +0200
----------------------------------------------------------------------
extensions/indexing-sql/dev-status.xml | 6 +++---
tools/generator-polygene/dev-status.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/357eb4e7/extensions/indexing-sql/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/dev-status.xml b/extensions/indexing-sql/dev-status.xml
index 762e250..71f671f 100644
--- a/extensions/indexing-sql/dev-status.xml
+++ b/extensions/indexing-sql/dev-status.xml
@@ -24,13 +24,13 @@
http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
- <codebase>stable</codebase>
+ <codebase>none</codebase>
<!-- none, brief, good, complete -->
- <documentation>brief</documentation>
+ <documentation>none</documentation>
<!-- none, some, good, complete -->
- <unittests>good</unittests>
+ <unittests>none</unittests>
</status>
<licenses>
<license>ALv2</license>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/357eb4e7/tools/generator-polygene/dev-status.xml
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/dev-status.xml b/tools/generator-polygene/dev-status.xml
index dc6c0e6..0928c46 100644
--- a/tools/generator-polygene/dev-status.xml
+++ b/tools/generator-polygene/dev-status.xml
@@ -24,13 +24,13 @@
http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
- <codebase>stable</codebase>
+ <codebase>none</codebase>
<!-- none, brief, good, complete -->
- <documentation>good</documentation>
+ <documentation>none</documentation>
<!-- none, some, good, complete -->
- <unittests>complete</unittests>
+ <unittests>none</unittests>
</status>
<licenses>
[31/50] [abbrv] polygene-java git commit: Better explanation in
exceptions of RDF query execution.
Posted by pa...@apache.org.
Better explanation in exceptions of RDF query execution.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/918d7b60
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/918d7b60
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/918d7b60
Branch: refs/heads/master
Commit: 918d7b60889330b30d40fd30b18af10841b1de75
Parents: fee3470
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:47:40 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:43 2017 +0200
----------------------------------------------------------------------
.../polygene/index/rdf/query/TupleQueryExecutor.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/918d7b60/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
index 2d80bd8..a515f74 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
@@ -90,19 +90,15 @@ public interface TupleQueryExecutor
}
catch( RepositoryException e )
{
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Exception when executing query: " + query + "\nwith bindings " + bindings, e );
}
- catch( MalformedQueryException e )
+ catch( QueryEvaluationException | MalformedQueryException e )
{
- throw new EntityFinderException( e );
- }
- catch( QueryEvaluationException e )
- {
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Query is invalid: " + query, e );
}
catch( Exception e )
{
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Unexpected Exception while executing: " + query, e );
}
}
[35/50] [abbrv] polygene-java git commit: Merge remote-tracking
branch 'origin/develop' into develop
Posted by pa...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/04a0f563
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/04a0f563
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/04a0f563
Branch: refs/heads/master
Commit: 04a0f5631ec4ce6dbdfddee9f987ab937a33e525
Parents: cdec0e8 b4700bb
Author: niclas <ni...@hedhman.org>
Authored: Fri Jul 14 14:31:29 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Jul 14 14:31:29 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[42/50] [abbrv] polygene-java git commit: Upgrade Gradle Rat Plugin
to 0.3.1
Posted by pa...@apache.org.
Upgrade Gradle Rat Plugin to 0.3.1
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/fc7c4326
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fc7c4326
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fc7c4326
Branch: refs/heads/master
Commit: fc7c43269a6afb4a4e3df5f97faf7773e4bfd03f
Parents: 2807487
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 07:21:20 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 07:21:20 2017 +0200
----------------------------------------------------------------------
buildSrc/build.gradle | 2 +-
.../gradle/structure/distributions/DistributionsPlugin.groovy | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fc7c4326/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 1927808..5e870a5 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -28,7 +28,7 @@ repositories {
dependencies {
compile gradleApi()
compile localGroovy()
- compile 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.0'
+ compile 'gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.3.1'
compile 'gradle.plugin.org.nosphere.honker:honker-gradle:0.3.0'
compile 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
compile 'org.apache.httpcomponents:httpclient:4.5.2'
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fc7c4326/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index d512d74..3cef75e 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -251,6 +251,9 @@ class DistributionsPlugin implements Plugin<Project>
task.group = TaskGroups.DISTRIBUTION_VERIFICATION
task.description = 'Checks the source distribution using Apache RAT.'
task.dependsOn TaskNames.STAGE_SOURCE_DIST
+ task.plainOutput = true
+ task.htmlOutput = true
+ task.xmlOutput = false
task.setInputDir unpackedSrcDistDir.absolutePath
task.onlyIf { !releaseSpec.developmentVersion }
task.excludes = [
@@ -436,6 +439,9 @@ class DistributionsPlugin implements Plugin<Project>
task.description = "Checks the binary distribution using Apache RAT."
task.onlyIf { !releaseSpec.developmentVersion }
task.dependsOn TaskNames.STAGE_BINARY_DIST
+ task.plainOutput = true
+ task.htmlOutput = true
+ task.xmlOutput = false
task.inputDir = unpackedBinDistDir.absolutePath
task.reportDir = project.file( 'build/reports/rat-bin-dist' )
task.excludes = [
[44/50] [abbrv] polygene-java git commit: Upgrade other dependencies
Posted by pa...@apache.org.
Upgrade other dependencies
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ec2855f5
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ec2855f5
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ec2855f5
Branch: refs/heads/master
Commit: ec2855f5593979966913c7fcc2e846e9a7c6c485
Parents: 361f6fe
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 08:56:39 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 08:56:39 2017 +0200
----------------------------------------------------------------------
dependencies.gradle | 58 ++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ec2855f5/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index ef62cf2..f9bc3de 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ dependencies.repositoriesUrls << [
// Core dependencies
def asmVersion = '5.2'
-def javaxJsonVersion = '1.0'
+def javaxJsonVersion = '1.1'
def osgiVersion = '4.3.1'
dependencies.libraries << [
asm : "org.ow2.asm:asm:$asmVersion",
@@ -44,41 +44,41 @@ dependencies.libraries << [
// Extensions, Libraries and Tools dependencies
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.57'
-def cassandraClientVersion = '3.2.0'
-def codahaleMetricsVersion = '3.2.2'
+def cassandraClientVersion = '3.3.0'
+def codahaleMetricsVersion = '3.2.3'
def commonsDbcpVersion = '2.1.1'
-def commonsLangVersion = '3.5'
+def commonsLangVersion = '3.6'
def commonsValidatorVersion = '1.6'
def derbyVersion = '10.13.1.1'
def ehcacheVersion = '3.3.1'
def elasticsearchVersion = '5.5.0'
def freemarkerVersion = '2.3.26-incubating'
-def geodeVersion = '1.1.1'
-def groovyVersion = '2.4.10'
-def hazelcastVersion = '3.8'
+def geodeVersion = '1.2.0'
+def groovyVersion = '2.4.12'
+def hazelcastVersion = '3.8.3'
def httpClientVersion = '4.5.3'
-def jacksonVersion = '2.8.7'
+def jacksonVersion = '2.8.9'
def jaxbApiVersion = '2.2.12'
-def jcloudsVersion = '2.0.1'
+def jcloudsVersion = '2.0.2'
def jdbmVersion = '2.4'
def jedisVersion = '2.9.0'
def jettyVersion = '9.2.17.v20160517' // 9.3.x Tests fail!
-def johnzonVersion = '1.0.0'
-def jooqVersion = '3.9.1'
+def johnzonVersion = '1.1.1'
+def jooqVersion = '3.9.3'
def leveldbVersion = '0.9'
def leveldbJniVersion = '1.8'
def liquibaseVersion = '3.5.3'
def mongodbVersion = '3.4.2'
-def msgpackVersion = '0.8.12'
-def restletVersion = '2.3.9'
+def msgpackVersion = '0.8.13'
+def restletVersion = '2.3.10'
def rdfVersion = '2.7.16' // 2.8.x change query results!! 4.x exists
def riakVersion = '2.1.1'
def servletVersion = '3.1.0'
-def shiroVersion = '1.3.2'
+def shiroVersion = '1.4.0'
def slf4jVersion = '1.7.25'
def solrVersion = "1.4.1" // 4.x Fails to compile!
-def springVersion = '4.3.7.RELEASE'
-def spymemcachedVersion = '2.12.2'
+def springVersion = '4.3.9.RELEASE'
+def spymemcachedVersion = '2.12.3'
def velocityVersion = '1.7'
dependencies.libraries << [
bonecp : "com.jolbox:bonecp:$bonecpVersion",
@@ -170,7 +170,7 @@ dependencies.libraries << [
// Tools dependencies
def jgoodiesLooksVersion = '2.7.0'
-def pdfboxVersion = '2.0.4'
+def pdfboxVersion = '2.0.6'
def prefuseVersion = '1.0.1'
dependencies.libraries << [
jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
@@ -179,20 +179,20 @@ dependencies.libraries << [
]
// Runtime, Test and Samples dependencies
-def awaitilityVersion = '2.0.0'
+def awaitilityVersion = '3.0.0'
def dnsJavaVersion = '2.1.8'
def dockerJUnitVersion = '0.3'
def easyMockVersion = '3.4'
-def embedMongoVersion = '1.50.5' // 2.0.0 exists
-def h2Version = '1.4.194'
+def embedMongoVersion = '2.0.0' // 2.0.0 exists
+def h2Version = '1.4.196'
def hamcrestVersion = '1.3'
def jaxRsApiVersion = '2.0.1'
def junitVersion = '4.12'
-def logbackVersion = '1.2.2' // TODO Replace with Apache Log4j 2
-def mockitoVersion = '2.7.21'
+def logbackVersion = '1.2.3' // TODO Replace with Apache Log4j 2
+def mockitoVersion = '2.8.47'
def mysqlVersion = '6.0.6'
-def postgresqlVersion = '42.0.0'
-def sqliteVersion = '3.16.1'
+def postgresqlVersion = '42.1.3'
+def sqliteVersion = '3.19.3'
def xmlUnitVersion = '2.3.0'
dependencies.libraries << [
awaitility : "org.awaitility:awaitility:$awaitilityVersion",
@@ -278,11 +278,11 @@ dependencies.buildToolsVersions << [
// Docker Images
dependencies.dockerImagesVersions << [
cassandra: 'cassandra:3.10',
- memcached: 'memcached:1.4.36-alpine',
+ memcached: 'memcached:1.4.39-alpine',
mariadb : 'mariadb:10.1.21',
- mongo : 'mongo:3.5.8',
- postgres : 'postgres:9.6.2-alpine',
- redis : 'redis:3.2.8-alpine',
+ mongo : 'mongo:3.5.10',
+ postgres : 'postgres:9.6.3-alpine',
+ redis : 'redis:4.0.0-alpine',
riak : 'basho/riak-kv:ubuntu-2.2.3',
- s3server : 'scality/s3server:mem-6a8e1cd'
+ s3server : 'scality/s3server:mem-bb2a38c0'
]
[26/50] [abbrv] polygene-java git commit: Get rid of warnings,
and some reformatting of a messy class.
Posted by pa...@apache.org.
Get rid of warnings, and some reformatting of a messy class.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/af87b22b
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/af87b22b
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/af87b22b
Branch: refs/heads/master
Commit: af87b22b7ed1aadc3d0c9774a4197af719e02ac0
Parents: 53fe704
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:36:19 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:07 2017 +0200
----------------------------------------------------------------------
.../support/skeletons/AbstractSQLIndexing.java | 281 ++++++++++---------
1 file changed, 141 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/af87b22b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
index 47e0503..a250d66 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
@@ -87,13 +87,16 @@ public abstract class AbstractSQLIndexing
implements SQLIndexing
{
- public static final Integer AMOUNT_OF_COLUMNS_IN_ENTITY_TABLE = 5;
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ENTITY_TABLE = 5;
- public static final Integer AMOUNT_OF_COLUMNS_IN_ALL_QNAMES_TABLE = 2;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ALL_QNAMES_TABLE = 2;
- public static final Integer AMOUNT_OF_COLUMNS_IN_ASSO_TABLE = 2;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ASSO_TABLE = 2;
- public static final Integer AMOUNT_OF_COLUMNS_IN_MANY_ASSO_TABLE = 3;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_MANY_ASSO_TABLE = 3;
@Structure
private Application _app;
@@ -299,10 +302,11 @@ public abstract class AbstractSQLIndexing
}
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createInsertStatement( String schemaName, String tableName,
Integer amountOfColumns,
SQLVendor vendor
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -315,16 +319,14 @@ public abstract class AbstractSQLIndexing
}
return m.insert().setTableName( t.tableName( schemaName, tableName ) )
- .setColumnSource( columnBuilder.createExpression() ).createExpression();
+ .setColumnSource( columnBuilder.createExpression() ).createExpression();
}
protected abstract InsertStatement createInsertStatementWithAutoGeneratedIDForEntitiesTable(
- String schemaName, String tableName, SQLVendor vendor
- );
+ String schemaName, String tableName, SQLVendor vendor );
- protected void addEntityInfoToInsertToEntityTablePS( EntityState state, PreparedStatement ps,
- int startingIndex
- )
+ @SuppressWarnings( "SameParameterValue" )
+ protected void addEntityInfoToInsertToEntityTablePS( EntityState state, PreparedStatement ps, int startingIndex )
throws SQLException
{
ps.setString( startingIndex, state.entityReference().identity().toString() );
@@ -333,9 +335,8 @@ public abstract class AbstractSQLIndexing
ps.setString( startingIndex + 3, this._app.version() );
}
- protected Long findEntityPK( EntityState state,
- Lazy<PreparedStatement, SQLException> queryPKPS
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected Long findEntityPK( EntityState state, Lazy<PreparedStatement, SQLException> queryPKPS )
throws SQLException
{
// TODO build cache: Polygene Identity -> PK
@@ -363,11 +364,11 @@ public abstract class AbstractSQLIndexing
protected abstract long getPKFromAutoGeneratedIDInsert(
EntityState state, PreparedStatement autoGeneratedIDStatement, SQLVendor vendor,
Connection connection
- )
+ )
throws SQLException;
- protected UpdateStatement
- createUpdateEntityTableStatement( String schemaName, SQLVendor vendor )
+ @SuppressWarnings( "WeakerAccess" )
+ protected UpdateStatement createUpdateEntityTableStatement( String schemaName, SQLVendor vendor )
{
ModificationFactory m = vendor.getModificationFactory();
BooleanFactory b = vendor.getBooleanFactory();
@@ -397,9 +398,8 @@ public abstract class AbstractSQLIndexing
return builder.createExpression();
}
- protected QueryExpression createQueryEntityPkByIdentityStatement( String schemaName,
- SQLVendor vendor
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected QueryExpression createQueryEntityPkByIdentityStatement( String schemaName, SQLVendor vendor )
{
BooleanFactory b = vendor.getBooleanFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -421,25 +421,25 @@ public abstract class AbstractSQLIndexing
return q.createQuery( query.createExpression() );
}
- protected DeleteStatement createDeleteFromEntityTableStatement( String schemaName,
- SQLVendor vendor
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected DeleteStatement createDeleteFromEntityTableStatement( String schemaName, SQLVendor vendor )
{
return this.createDeleteFromTableStatement( schemaName, DBNames.ENTITY_TABLE_NAME,
DBNames.ENTITY_TABLE_IDENTITY_COLUMN_NAME, vendor );
}
- protected DeleteStatement
- createClearEntityDataStatement( String schemaName, SQLVendor vendor )
+ @SuppressWarnings( "WeakerAccess" )
+ protected DeleteStatement createClearEntityDataStatement( String schemaName, SQLVendor vendor )
{
return this.createDeleteFromTableStatement( schemaName, DBNames.ALL_QNAMES_TABLE_NAME,
DBNames.ENTITY_TABLE_PK_COLUMN_NAME, vendor );
}
+ @SuppressWarnings( "WeakerAccess" )
protected DeleteStatement createDeleteFromTableStatement( String schemaName, String tableName,
String columnName,
SQLVendor vendor
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
BooleanFactory b = vendor.getBooleanFactory();
@@ -452,12 +452,13 @@ public abstract class AbstractSQLIndexing
// ";" //
DeleteBySearchBuilder delete = m.deleteBySearch();
delete.setTargetTable( m.createTargetTable( t.tableName( schemaName, tableName ) ) )
- .getWhere()
- .reset( b.eq( c.colName( columnName ), l.param() ) );
+ .getWhere()
+ .reset( b.eq( c.colName( columnName ), l.param() ) );
return delete.createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createPropertyInsert( QNameInfo qNameInfo, SQLVendor vendor )
{
String tableName = qNameInfo.getTableName();
@@ -466,7 +467,7 @@ public abstract class AbstractSQLIndexing
LiteralFactory l = vendor.getLiteralFactory();
ColumnSourceByValuesBuilder columnBuilder = m.columnSourceByValues()
- .addValues( l.param(), l.param(), l.param() );
+ .addValues( l.param(), l.param(), l.param() );
if( qNameInfo.getCollectionDepth() > 0 )
{
columnBuilder.addValues( l.func( "text2ltree", l.param() ) );
@@ -474,12 +475,13 @@ public abstract class AbstractSQLIndexing
columnBuilder.addValues( l.param() );
return m.insert().setTableName( t.tableName( this._state.schemaName().get(), tableName ) )
- .setColumnSource( columnBuilder.createExpression() ).createExpression();
+ .setColumnSource( columnBuilder.createExpression() ).createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createAssoInsert( QNameInfo qNameInfo, SQLVendor vendor,
Integer amountOfParams
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -512,6 +514,7 @@ public abstract class AbstractSQLIndexing
.createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createInsertEntityTypeStatement( String schemaName, SQLVendor vendor )
{
return this.createInsertStatement( schemaName, ENTITY_TYPES_JOIN_TABLE_NAME, 2, vendor );
@@ -520,7 +523,7 @@ public abstract class AbstractSQLIndexing
private void syncQNamesInsertPSs( Connection connection,
Map<QualifiedName, PreparedStatement> qNameInsertPSs,
Set<QualifiedName> qNames
- )
+ )
throws SQLException
{
Set<QualifiedName> copy = new HashSet<>( qNames );
@@ -530,8 +533,7 @@ public abstract class AbstractSQLIndexing
QNameInfo info = this._state.qNameInfos().get().get( qName );
if( info == null )
{
- throw new InternalError(
- "Could not find database information about qualified name [" + qName + "]" );
+ throw new SqlIndexingException( "Could not find database information about qualified name [" + qName + "]" );
}
QNameType type = info.getQNameType();
@@ -549,8 +551,7 @@ public abstract class AbstractSQLIndexing
}
else
{
- throw new IllegalArgumentException( "Did not know what to do with QName of type "
- + type + "." );
+ throw new SqlIndexingException( "Did not know what to do with QName of type " + type + "." );
}
}
}
@@ -575,7 +576,7 @@ public abstract class AbstractSQLIndexing
private PreparedStatement createInsertManyAssociationPS( Connection connection,
QNameInfo qNameInfo
- )
+ )
throws SQLException
{
SQLVendor vendor = this.descriptor.metaInfo( SQLVendor.class );
@@ -594,34 +595,34 @@ public abstract class AbstractSQLIndexing
private Integer insertPropertyQNames( Connection connection,
Map<QualifiedName, PreparedStatement> qNameInsertPSs,
PreparedStatement insertAllQNamesPS, EntityState state, Long entityPK
- )
+ )
throws SQLException
{
Set<QualifiedName> qNames = this._state.entityUsedQNames().get().get( state.entityDescriptor() );
this.syncQNamesInsertPSs( connection, qNameInsertPSs, qNames );
- final Integer propertyPK[] = {0};
+ final Integer propertyPK[] = { 0 };
state.entityDescriptor().state().properties()
- .filter( pDesc -> SQLSkeletonUtil.isQueryable( pDesc.accessor() ) )
- .forEach( pDesc -> {
- try
- {
- propertyPK[0] = this.insertProperty(
- qNameInsertPSs,
- insertAllQNamesPS,
- propertyPK[0],
- entityPK,
- pDesc.qualifiedName(),
- state.propertyValueOf( pDesc.qualifiedName() ),
- null //
- );
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting property " + pDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
- return propertyPK[0];
+ .filter( pDesc -> SQLSkeletonUtil.isQueryable( pDesc.accessor() ) )
+ .forEach( pDesc -> {
+ try
+ {
+ propertyPK[ 0 ] = this.insertProperty(
+ qNameInsertPSs,
+ insertAllQNamesPS,
+ propertyPK[ 0 ],
+ entityPK,
+ pDesc.qualifiedName(),
+ state.propertyValueOf( pDesc.qualifiedName() ),
+ null //
+ );
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting property " + pDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
+ return propertyPK[ 0 ];
}
private void insertAssoAndManyAssoQNames( Map<QualifiedName, PreparedStatement> qNameInsertPSs,
@@ -629,71 +630,71 @@ public abstract class AbstractSQLIndexing
EntityState state,
final Integer localPK,
Long entityPK
- )
+ )
throws SQLException
{
- final Integer[] qNamePK = {localPK};
+ final Integer[] qNamePK = { localPK };
state.entityDescriptor().state().associations()
- .filter( aDesc -> SQLSkeletonUtil.isQueryable( aDesc.accessor() ) )
- .forEach( aDesc -> {
- try
- {
- QualifiedName qName = aDesc.qualifiedName();
- PreparedStatement ps = qNameInsertPSs.get( qName );
- EntityReference ref = state.associationValueOf( qName );
- if( ref != null )
- {
- insertToAllQNamesPS.setInt( 1, qNamePK[0] );
- insertToAllQNamesPS.setLong( 2, entityPK );
- insertToAllQNamesPS.addBatch();
-
- ps.setInt( 1, qNamePK[0] );
- ps.setLong( 2, entityPK );
- ps.setString( 3, ref.identity().toString() );
- ps.addBatch();
-
- qNamePK[0] += 1;
- }
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting association " + aDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
+ .filter( aDesc -> SQLSkeletonUtil.isQueryable( aDesc.accessor() ) )
+ .forEach( aDesc -> {
+ try
+ {
+ QualifiedName qName = aDesc.qualifiedName();
+ PreparedStatement ps = qNameInsertPSs.get( qName );
+ EntityReference ref = state.associationValueOf( qName );
+ if( ref != null )
+ {
+ insertToAllQNamesPS.setInt( 1, qNamePK[ 0 ] );
+ insertToAllQNamesPS.setLong( 2, entityPK );
+ insertToAllQNamesPS.addBatch();
+
+ ps.setInt( 1, qNamePK[ 0 ] );
+ ps.setLong( 2, entityPK );
+ ps.setString( 3, ref.identity().toString() );
+ ps.addBatch();
+
+ qNamePK[ 0 ] += 1;
+ }
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting association " + aDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
state.entityDescriptor().state().manyAssociations()
- .filter( mDesc -> SQLSkeletonUtil.isQueryable( mDesc.accessor() ) )
- .forEach( mDesc -> {
- try
- {
- QualifiedName qName = mDesc.qualifiedName();
- PreparedStatement ps = qNameInsertPSs.get( qName );
- Integer index = 0;
- for( EntityReference ref : state.manyAssociationValueOf( qName ) )
- {
- if( ref != null )
- {
- insertToAllQNamesPS.setInt( 1, qNamePK[0] );
- insertToAllQNamesPS.setLong( 2, entityPK );
- insertToAllQNamesPS.addBatch();
-
- ps.setInt( 1, qNamePK[0] );
- ps.setLong( 2, entityPK );
- ps.setInt( 3, index );
- ps.setString( 4, ref.identity().toString() );
- ps.addBatch();
- qNamePK[0] += 1;
- }
- ++index;
- }
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting manyassociation " + mDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
+ .filter( mDesc -> SQLSkeletonUtil.isQueryable( mDesc.accessor() ) )
+ .forEach( mDesc -> {
+ try
+ {
+ QualifiedName qName = mDesc.qualifiedName();
+ PreparedStatement ps = qNameInsertPSs.get( qName );
+ Integer index = 0;
+ for( EntityReference ref : state.manyAssociationValueOf( qName ) )
+ {
+ if( ref != null )
+ {
+ insertToAllQNamesPS.setInt( 1, qNamePK[ 0 ] );
+ insertToAllQNamesPS.setLong( 2, entityPK );
+ insertToAllQNamesPS.addBatch();
+
+ ps.setInt( 1, qNamePK[ 0 ] );
+ ps.setLong( 2, entityPK );
+ ps.setInt( 3, index );
+ ps.setString( 4, ref.identity().toString() );
+ ps.addBatch();
+ qNamePK[ 0 ] += 1;
+ }
+ ++index;
+ }
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting manyassociation " + mDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
}
private Integer insertProperty(
@@ -704,7 +705,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
Integer result = propertyPK;
@@ -744,7 +745,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Collection<?> property,
Integer parentQNameID
- )
+ )
throws SQLException
{
QNameInfo info = this._state.qNameInfos().get().get( qName );
@@ -762,7 +763,7 @@ public abstract class AbstractSQLIndexing
private Integer storeCollectionInfo( PreparedStatement insertAllQNamesPS, Integer propertyPK,
Long entityPK,
Integer parentQNameID, PreparedStatement ps, QNameInfo info
- )
+ )
throws SQLException
{
insertAllQNamesPS.setInt( 1, propertyPK );
@@ -798,7 +799,7 @@ public abstract class AbstractSQLIndexing
Integer parentPK,
Type finalType,
Boolean isFinalTypePrimitive
- )
+ )
throws SQLException
{
Integer index = 0;
@@ -836,7 +837,7 @@ public abstract class AbstractSQLIndexing
Object item,
Boolean isFinalTypePrimitive,
Type finalType
- )
+ )
throws SQLException
{
insertAllQNamesPS.setInt( 1, propertyPK );
@@ -869,7 +870,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
QNameInfo info = this._state.qNameInfos().get().get( qName );
@@ -896,7 +897,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
@@ -920,7 +921,7 @@ public abstract class AbstractSQLIndexing
Integer localPK,
Long entityPK,
Object property
- )
+ )
throws SQLException
{
ValueDescriptor vDesc = this._qi4SPI.valueDescriptorFor( property );
@@ -930,15 +931,15 @@ public abstract class AbstractSQLIndexing
try
{
- propertyPK[0] = this.insertProperty(
+ propertyPK[ 0 ] = this.insertProperty(
qNameInsertPSs,
insertAllQNamesPS,
- propertyPK[0],
+ propertyPK[ 0 ],
entityPK,
pDesc.qualifiedName(),
state.propertyFor( pDesc.accessor() ).get(),
localPK
- );
+ );
}
catch( SQLException e )
{
@@ -947,13 +948,13 @@ public abstract class AbstractSQLIndexing
}
} );
- return propertyPK[0];
+ return propertyPK[ 0 ];
}
private void storePrimitiveUsingPS( PreparedStatement ps, Integer nextFreeIndex,
Object primitive,
Type primitiveType
- )
+ )
throws SQLException
{
if( primitiveType instanceof ParameterizedType )
@@ -968,7 +969,7 @@ public abstract class AbstractSQLIndexing
nextFreeIndex,
this._state.enumPKs().get().get(
QualifiedName.fromClass( (Class<?>) primitiveType, primitive.toString() ).toString() )
- );
+ );
}
else
{
@@ -999,7 +1000,7 @@ public abstract class AbstractSQLIndexing
EntityState state,
Long entityPK,
Map<Long, Integer> qNamePKs
- )
+ )
throws SQLException
{
@@ -1024,7 +1025,7 @@ public abstract class AbstractSQLIndexing
EntityState state,
Long entityPK,
Map<Long, Integer> qNamePKs
- )
+ )
throws SQLException
{
Integer nextQnamePK = this.insertPropertyQNames( connection,
@@ -1047,9 +1048,9 @@ public abstract class AbstractSQLIndexing
Integer typePK = this._state.entityTypePKs().get().get( clazz.getName() );
if( typePK == null )
{
- throw new InternalError( "Tried to get entity : " + clazz
- + ", but only aware of the following entities: "
- + this._state.entityTypePKs().get().keySet() );
+ throw new SqlIndexingException( "Tried to get entity : " + clazz
+ + ", but only aware of the following entities: "
+ + this._state.entityTypePKs().get().keySet() );
}
try
{
@@ -1059,7 +1060,7 @@ public abstract class AbstractSQLIndexing
}
catch( SQLException e )
{
- throw new EntityStoreException( "Underlying Exception when inserting " + entityPK,
+ throw new SqlIndexingException( "Underlying Exception when inserting " + entityPK,
SQLUtil.withAllSQLExceptions( e ) );
}
} );
[37/50] [abbrv] polygene-java git commit: Keystore issues. Fixed.
Posted by pa...@apache.org.
Keystore issues. Fixed.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/fde12959
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fde12959
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fde12959
Branch: refs/heads/master
Commit: fde12959240ce2641c35ab8decfd94176389e16c
Parents: 29ecdba
Author: niclas <ni...@hedhman.org>
Authored: Sat Jul 15 18:15:06 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sat Jul 15 18:15:06 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/index.js | 11 +++++++++++
.../HttpServerModule/bootstrap.tmpl | 19 ++++++++++++++-----
.../app/templates/RestAPIApplication/app.js | 3 ++-
.../app/templates/buildtool/build.js | 4 ++--
4 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fde12959/tools/generator-polygene/app/index.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/index.js b/tools/generator-polygene/app/index.js
index 434e74e..9d220a7 100644
--- a/tools/generator-polygene/app/index.js
+++ b/tools/generator-polygene/app/index.js
@@ -312,6 +312,17 @@ function assignFunctions(polygene) {
}
};
+ polygene.copyBinary = function (ctx, from, to) {
+
+ try {
+ ctx.fs.copy(
+ ctx.templatePath(from),
+ ctx.destinationPath(to));
+ } catch (exception) {
+ console.log("Unable to copy binary: " + from + " to " + to + "\n", exception);
+ }
+ };
+
polygene.copyPolygeneBootstrap = function (ctx, layer, moduleName, condition) {
if (condition) {
copyTemplate(ctx,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fde12959/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index 744d8fd..addab42 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -22,6 +22,7 @@ package <%= polygene.packageName %>.bootstrap.connectivity;
import java.util.HashMap;
<% if( hasFeature('security') ) { %>
import java.io.File;
+import java.net.URL;
import org.apache.polygene.library.http.SecureJettyConfiguration;
import org.apache.polygene.library.http.SecureJettyServiceAssembler;
import org.apache.polygene.library.shiro.web.assembly.HttpShiroAssembler;
@@ -46,10 +47,10 @@ public class HttpServerModule
implements ModuleAssembler
{<% if( hasFeature('security') ) { %>
private static final int DEFAULT_PORT = 8443;
- public static final String KS_PASSWORD = "1234"; // TODO: Secure the key stores
- public static final String SERVER_KEYSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.p12";
+ public static final String KS_PASSWORD = "123456"; // TODO: Secure the key stores
+ public static final String SERVER_KEYSTORE_FILENAME = "security/keystore-<%= polygene.name.toLowerCase() %>.p12";
public static final String SERVER_KEYSTORE_TYPE = "PKCS12";
- public static final String TRUSTSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.p12";
+ public static final String TRUSTSTORE_FILENAME = "security/keystore-<%= polygene.name.toLowerCase() %>.p12";
public static final String TRUSTSTORE_TYPE = "PKCS12";
<% } else {
%> protected static final int DEFAULT_PORT = 8080;
@@ -70,10 +71,18 @@ public class HttpServerModule
.visibleIn( Visibility.layer )
.assemble( module );
SecureJettyConfiguration defaults = module.forMixin( SecureJettyConfiguration.class ).declareDefaults();
- defaults.keystorePath().set( new File( SERVER_KEYSTORE_FILENAME ).getAbsolutePath() );
+ URL keyStoreResource = getClass().getClassLoader().getResource( SERVER_KEYSTORE_FILENAME );
+ if( keyStoreResource != null )
+ {
+ defaults.keystorePath().set( keyStoreResource.toExternalForm() );
+ }
defaults.keystoreType().set( SERVER_KEYSTORE_TYPE );
defaults.keystorePassword().set( KS_PASSWORD );
- defaults.truststorePath().set( new File( TRUSTSTORE_FILENAME ).getAbsolutePath() );
+ URL trustStoreResource = getClass().getClassLoader().getResource( TRUSTSTORE_FILENAME );
+ if( trustStoreResource != null )
+ {
+ defaults.truststorePath().set( trustStoreResource.toExternalForm() );
+ }
defaults.truststoreType().set( TRUSTSTORE_TYPE );
defaults.truststorePassword().set( KS_PASSWORD );
defaults.wantClientAuth().set( Boolean.FALSE );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fde12959/tools/generator-polygene/app/templates/RestAPIApplication/app.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/app.js b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
index 03ddff9..106bb2d 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
@@ -34,7 +34,8 @@ module.exports = {
if (p.hasFeature('security')) {
p.copyToConfig(p.ctx, 'RestAPIApplication/web-shiro.ini.tmpl', 'web-shiro.ini');
- p.copyToConfig(p.ctx, 'RestAPIApplication/dev-keystore.p12', 'security/keystore-' + p.name + '.p12');
+ p.copyBinary(p.ctx, 'RestAPIApplication/dev-keystore.p12', 'app/src/dist/config/development/security/keystore-' + p.name.toLowerCase() + '.p12');
+ p.copyBinary(p.ctx, 'RestAPIApplication/dev-keystore.p12', 'app/src/test/resources/security/keystore-' + p.name.toLowerCase() + '.p12');
}
p.copyTemplate(p.ctx,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fde12959/tools/generator-polygene/app/templates/buildtool/build.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/build.js b/tools/generator-polygene/app/templates/buildtool/build.js
index 17c0a68..dbd3ac3 100644
--- a/tools/generator-polygene/app/templates/buildtool/build.js
+++ b/tools/generator-polygene/app/templates/buildtool/build.js
@@ -30,8 +30,8 @@ module.exports = {
p.copyTemplate(p.ctx, 'buildtool/wrapper/gradlew.tmpl', 'gradlew');
p.copyTemplate(p.ctx, 'buildtool/wrapper/gradlew-bat.tmpl', 'gradlew.bat');
- p.ctx.fs.copy(p.ctx.templatePath('buildtool/wrapper/gradle-wrapper.jar_'), p.ctx.destinationPath('gradle/wrapper/gradle-wrapper.jar'));
- p.ctx.fs.copy(p.ctx.templatePath('buildtool/wrapper/gradle-wrapper.properties_'), p.ctx.destinationPath('gradle/wrapper/gradle-wrapper.properties'));
+ p.copyBinary(p.ctx, 'buildtool/wrapper/gradle-wrapper.jar_', 'gradle/wrapper/gradle-wrapper.jar');
+ p.copyBinary(p.ctx, 'buildtool/wrapper/gradle-wrapper.properties_','gradle/wrapper/gradle-wrapper.properties');
}
};
[41/50] [abbrv] polygene-java git commit: Upgrade Gradle to 4.0.1
Posted by pa...@apache.org.
Upgrade Gradle to 4.0.1
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/28074874
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/28074874
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/28074874
Branch: refs/heads/master
Commit: 28074874e2e8d1abf2388dcb759d7d0134c0fad3
Parents: 503fa86
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Jul 16 21:07:06 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Jul 16 21:07:06 2017 +0200
----------------------------------------------------------------------
dependencies.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 54706 -> 54712 bytes
gradle/wrapper/gradle-wrapper.properties | 3 +--
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/28074874/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index 3c6bfaf..2cb6388 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,7 +20,7 @@ import org.apache.polygene.gradle.dependencies.DependenciesDeclarationExtension
def dependencies = extensions.getByType( DependenciesDeclarationExtension )
// Gradle version
-dependencies.gradleVersion = '4.0'
+dependencies.gradleVersion = '4.0.1'
// Remote repositories
dependencies.repositoriesUrls << [
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/28074874/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7536313..e72a4d1 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/28074874/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 125e44b..e7e0968 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -20,5 +20,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
[34/50] [abbrv] polygene-java git commit: Fix bugs in generator.
Posted by pa...@apache.org.
Fix bugs in generator.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/b4700bb4
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/b4700bb4
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/b4700bb4
Branch: refs/heads/master
Commit: b4700bb433bbd83da70178d777a2264fa8450549
Parents: 47c6669
Author: niclas <ni...@hedhman.org>
Authored: Mon Jul 10 11:32:52 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:14:06 2017 +0200
----------------------------------------------------------------------
.../templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 2 +-
.../app/templates/InfrastructureLayer/IndexingModule/module.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b4700bb4/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index 84c6226..744d8fd 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -64,7 +64,7 @@ public class HttpServerModule
%> new HttpShiroAssembler()
.withConfig( module, Visibility.module )
.assemble( module );
- module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("web-shiro.ini");
+ module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("classpath:web-shiro.ini");
new SecureJettyServiceAssembler()
.withConfig( module, Visibility.layer )
.visibleIn( Visibility.layer )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b4700bb4/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
index bbcfb28..dfefccb 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
@@ -35,7 +35,7 @@ module.exports = {
'InfrastructureLayer/IndexingModule/indexing/solrconfig.xml',
'solrconfig.xml'
);
- p.copyTemplate(
+ p.copyToConfig(
p.ctx,
'InfrastructureLayer/IndexingModule/indexing/solr-schema.xml',
'schema.xml'
[39/50] [abbrv] polygene-java git commit: Extension was accidentally
changed.
Posted by pa...@apache.org.
Extension was accidentally changed.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/b672ffc9
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/b672ffc9
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/b672ffc9
Branch: refs/heads/master
Commit: b672ffc978367fea1f7882f9ee95d15c289f5470
Parents: 4f89ad9
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 16 09:32:13 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 16 09:32:13 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/templates/RestAPIApplication/app.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b672ffc9/tools/generator-polygene/app/templates/RestAPIApplication/app.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/app.js b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
index 106bb2d..9b6125b 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
@@ -52,11 +52,11 @@ module.exports = {
p.copyTemplate(p.ctx,
'RestAPIApplication/customUnixStartScript.txt.tmpl',
- 'app/src/scripts/customUnixStartScript.txt.tmpl');
+ 'app/src/scripts/customUnixStartScript.txt');
p.copyTemplate(p.ctx,
'RestAPIApplication/customWindowsStartScript.txt.tmpl',
- 'app/src/scripts/customWindowsStartScript.txt.tmpl');
+ 'app/src/scripts/customWindowsStartScript.txt');
}
};
[19/50] [abbrv] polygene-java git commit: Move IndexingException to
API
Posted by pa...@apache.org.
Move IndexingException to API
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5462924e
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5462924e
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5462924e
Branch: refs/heads/master
Commit: 5462924e3a65192dbe31a96f04f08f884e2bf721
Parents: c7d66e1
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:40:03 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:40:03 2017 +0800
----------------------------------------------------------------------
.../api/indexing/IndexingException.java | 17 ++++++++++
.../MissingIndexingSystemException.java | 34 +++++++++++++++++++
.../query/MissingIndexingSystemException.java | 35 --------------------
.../polygene/spi/query/IndexingException.java | 17 ----------
.../support/skeletons/SqlIndexingException.java | 2 +-
5 files changed, 52 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5462924e/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
new file mode 100644
index 0000000..59bacdb
--- /dev/null
+++ b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.api.indexing;
+
+/**
+ * This is the exception for Indexing problems. Subtypes should be created for specific problems.
+ *
+ */
+public abstract class IndexingException extends RuntimeException
+{
+ public IndexingException( String message )
+ {
+ super( message );
+ }
+ public IndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5462924e/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java b/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java
new file mode 100644
index 0000000..cf0fd00
--- /dev/null
+++ b/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.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.api.indexing;
+
+import org.apache.polygene.api.query.QueryException;
+
+/**
+ * This Exception is thrown in <code>QueryBuilderFactory.newQueryBuilder()</code> method if
+ * no indexing subsystem has been declared in the assembly.
+ */
+public final class MissingIndexingSystemException extends IndexingException
+{
+ public MissingIndexingSystemException()
+ {
+ super( "No EntityFinder has been declared in the assembly of the application." );
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5462924e/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java b/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
deleted file mode 100644
index e15cbee..0000000
--- a/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
+++ /dev/null
@@ -1,35 +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.api.query;
-
-/**
- * This Exception is thrown in <code>QueryBuilderFactory.newQueryBuilder()</code> method if
- * no indexing subsystem has been declared in the assembly.
- */
-public final class MissingIndexingSystemException
- extends QueryException
-{
- private static final long serialVersionUID = 5147421865890379209L;
-
- public MissingIndexingSystemException()
- {
- super( "No EntityFinder has been declared in the assembly of the application." );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5462924e/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
deleted file mode 100644
index 6fc8124..0000000
--- a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.polygene.spi.query;
-
-/**
- * This is the exception for Indexing problems. Subtypes should be created for specific problems.
- *
- */
-public abstract class IndexingException extends RuntimeException
-{
- public IndexingException( String message )
- {
- super( message );
- }
- public IndexingException( String message, Throwable cause )
- {
- super( message, cause );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5462924e/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
index cfa3b80..7970590 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
@@ -1,6 +1,6 @@
package org.apache.polygene.index.sql.support.skeletons;
-import org.apache.polygene.spi.query.IndexingException;
+import org.apache.polygene.api.indexing.IndexingException;
@SuppressWarnings( "WeakerAccess" )
public class SqlIndexingException extends IndexingException
[30/50] [abbrv] polygene-java git commit: Making
ElasticSearchIndexingException extend from IndexingException
Posted by pa...@apache.org.
Making ElasticSearchIndexingException extend from IndexingException
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/fee3470f
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/fee3470f
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/fee3470f
Branch: refs/heads/master
Commit: fee3470fcb4ff938fa55c266bc34f4c19670416f
Parents: 460bd5c
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:41:27 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:36 2017 +0200
----------------------------------------------------------------------
.../elasticsearch/ElasticSearchIndexingException.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/fee3470f/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
index b578c6a..27b6a19 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
@@ -19,17 +19,18 @@
*/
package org.apache.polygene.index.elasticsearch;
-public class ElasticSearchIndexingException extends RuntimeException
+import org.apache.polygene.api.indexing.IndexingException;
+
+public class ElasticSearchIndexingException extends IndexingException
{
- public ElasticSearchIndexingException( String string )
+ public ElasticSearchIndexingException( String message )
{
- super( string );
+ super( message );
}
- public ElasticSearchIndexingException( String string, Throwable thrwbl )
+ public ElasticSearchIndexingException( String message, Throwable cause )
{
- super( string, thrwbl );
+ super( message, cause );
}
-
}
[50/50] [abbrv] polygene-java git commit: Merge branch
'release/3.0.0-RC2' into develop
Posted by pa...@apache.org.
Merge branch 'release/3.0.0-RC2' into develop
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c8b40a21
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c8b40a21
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c8b40a21
Branch: refs/heads/develop
Commit: c8b40a213379960de0703eef0fbdac47ec013b64
Parents: ae9506a 357eb4e
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 13:52:01 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 13:52:01 2017 +0200
----------------------------------------------------------------------
extensions/indexing-sql/dev-status.xml | 6 +++---
tools/generator-polygene/dev-status.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[05/50] [abbrv] polygene-java git commit: Forgot to maintain the
toString() proper.
Posted by pa...@apache.org.
Forgot to maintain the toString() proper.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/3c7271c8
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/3c7271c8
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/3c7271c8
Branch: refs/heads/master
Commit: 3c7271c8c037a9a9ccc04ceb99bf7028816e6309
Parents: c6b8916
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 2 14:47:50 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 2 14:47:50 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/polygene/runtime/value/ValueInstance.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3c7271c8/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
index 8af2e08..79deff9 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/value/ValueInstance.java
@@ -158,6 +158,11 @@ public final class ValueInstance extends TransientInstance
@Override
public String toString()
{
+ String json = toJsonString();
+ if( json != null )
+ {
+ return json;
+ }
return "ValueInstance{" +
"mixins=" + Arrays.toString( mixins ) +
", state=" + state +
[06/50] [abbrv] polygene-java git commit: Fixed a mistake in the
larger refactoring.
Posted by pa...@apache.org.
Fixed a mistake in the larger refactoring.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/cf12e4b8
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/cf12e4b8
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/cf12e4b8
Branch: refs/heads/master
Commit: cf12e4b892759b5c15911a96a7aa619084902c13
Parents: 3c7271c
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 2 16:19:48 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 2 16:19:48 2017 +0800
----------------------------------------------------------------------
.../app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cf12e4b8/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index c7e161e..d30c1f3 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -21,6 +21,7 @@ package <%= polygene.packageName %>.bootstrap.connectivity;
import java.util.HashMap;
<% if( hasFeature('security') ) { %>
+import java.io.File;
import org.apache.polygene.library.http.SecureJettyConfiguration;
import org.apache.polygene.library.http.SecureJettyServiceAssembler;
import org.apache.polygene.library.shiro.web.assembly.HttpShiroAssembler;
[15/50] [abbrv] polygene-java git commit: Forgot to assemble Shiro
module
Posted by pa...@apache.org.
Forgot to assemble Shiro module
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/002fb1c7
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/002fb1c7
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/002fb1c7
Branch: refs/heads/master
Commit: 002fb1c7d61f53816c633fbec0ffdcef4fffa758
Parents: f838035
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 11:42:44 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 11:42:44 2017 +0800
----------------------------------------------------------------------
.../templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/002fb1c7/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index 98fc77a..84c6226 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -62,7 +62,8 @@ public class HttpServerModule
{
<% if( hasFeature('security') ) {
%> new HttpShiroAssembler()
- .withConfig( module, Visibility.module );
+ .withConfig( module, Visibility.module )
+ .assemble( module );
module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("web-shiro.ini");
new SecureJettyServiceAssembler()
.withConfig( module, Visibility.layer )
[36/50] [abbrv] polygene-java git commit: Various fixes in
tools/generator-polygene, fixing some things.
Posted by pa...@apache.org.
Various fixes in tools/generator-polygene, fixing some things.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/29ecdba0
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/29ecdba0
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/29ecdba0
Branch: refs/heads/master
Commit: 29ecdba0615c81c94f8677e01dcf802ee8387ccf
Parents: 04a0f56
Author: niclas <ni...@hedhman.org>
Authored: Fri Jul 14 22:40:56 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Jul 14 22:40:56 2017 +0800
----------------------------------------------------------------------
.../distributions/DistributionsPlugin.groovy | 5 -
.../sql/PostgreSQLEntityStoreTestSuite.java | 2 +-
.../DevelopmentKeyManagement.java.tmpl | 259 -------------------
.../RestAPIApplication/Launcher.java.tmpl | 8 +-
.../app/templates/RestAPIApplication/app.js | 18 +-
.../RestAPIApplication/bootstrap-test.tmpl | 5 +-
.../customUnixStartScript.txt | 175 -------------
.../customUnixStartScript.txt.tmpl | 175 +++++++++++++
.../customWindowsStartScript.txt | 89 -------
.../customWindowsStartScript.txt.tmpl | 89 +++++++
.../RestAPIApplication/dev-keystore.p12 | Bin 0 -> 2586 bytes
.../src/docs/yeoman_polygene.txt | 1 -
12 files changed, 274 insertions(+), 552 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index bc6e796..d512d74 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -165,9 +165,6 @@ class DistributionsPlugin implements Plugin<Project>
spec.exclude '**/.nb-gradle/**' // Netbeans files
spec.exclude '**/.nb-gradle*' // Netbeans files
- // Polygene Generator files
- spec.exclude 'tools/generator-polygene/app/templates/**/*.txt'
-
spec.into '.'
}
def srcDistSupplementaryFilesCopySpec = project.copySpec { CopySpec spec ->
@@ -291,8 +288,6 @@ class DistributionsPlugin implements Plugin<Project>
'manual/**/jquery*.js',
// W3C XML Schemas - W3C Software License
'samples/rental/src/main/resources/*.xsd',
- // Polygene Generator Heroes Templates - MIT
- 'tools/generator-polygene/app/templates/Heroes/**',
]
} as Action<RatTask> )
project.tasks.create( TaskNames.INSPECT_SOURCE_DIST ) { Task task ->
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
index d1dd952..41669f2 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
@@ -44,7 +44,7 @@ public class PostgreSQLEntityStoreTestSuite extends EntityStoreTestSuite
{
@ClassRule
public static final DockerRule DOCKER = new DockerRule( "postgres",
- 3000L,
+ 10000L,
"PostgreSQL init process complete; ready for start up." );
@Override
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/DevelopmentKeyManagement.java.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/DevelopmentKeyManagement.java.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/DevelopmentKeyManagement.java.tmpl
deleted file mode 100644
index d724253..0000000
--- a/tools/generator-polygene/app/templates/RestAPIApplication/DevelopmentKeyManagement.java.tmpl
+++ /dev/null
@@ -1,259 +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 <%= polygene.packageName %>.app;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import javax.net.ssl.KeyManagerFactory;
-import javax.security.auth.x500.X500Principal;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.jce.X509KeyUsage;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-
-import static <%= polygene.packageName %>.bootstrap.connectivity.HttpServerModule.*;
-
-/**
- * This class creates self-signed SSL certificate into the security/ directory.
- * <p>
- * NOTE: This is for use in development only. For production setup, please use better tooling.
- * </p>
- */
-class DevelopmentKeyManagement
-{
- private static final String COMMON_NAME = "<%= polygene.packageName %>";
- private static final int RSA_KEY_LEN = 4096;
-
- static void initializeKeyStore()
- {
- @SuppressWarnings( "unused" )
- KeyStore trustStore = loadKeyStore( new File(TRUSTSTORE_FILENAME), TRUSTSTORE_TYPE, KS_PASSWORD );
-
- File keyFile = new File( SERVER_KEYSTORE_FILENAME );
- KeyStore keyStore = loadKeyStore( keyFile, SERVER_KEYSTORE_TYPE, KS_PASSWORD );
- initializeKeyManager( keyStore, KS_PASSWORD );
- createKeyStoreData( keyStore, keyFile, SERVER_KEYSTORE_TYPE, KS_PASSWORD );
- }
-
- private static KeyStore loadKeyStore( File keyFile, String type, String password )
- {
- if( !keyFile.exists() )
- {
- createKeyStore(keyFile, type, password);
- }
- try( FileInputStream fis = new FileInputStream( keyFile ) )
- {
- KeyStore ks = KeyStore.getInstance( type );
- char[] pwd = password.toCharArray();
- ks.load( fis, pwd );
- return ks;
- }
- catch( Exception e )
- {
- throw new AssemblyException( "Unable to create keystore.", e );
- }
- }
-
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
- private static void createKeyStore( File keyFile, String type, String password )
- throws AssemblyException
- {
- if( !keyFile.getParentFile().exists() )
- {
- keyFile.getParentFile().mkdirs();
- }
- try( FileOutputStream fos = new FileOutputStream( keyFile ) )
- {
- KeyStore ks = KeyStore.getInstance( type );
- char[] pwd = password.toCharArray();
- ks.load( null, pwd );
- ks.store( fos, pwd );
- }
- catch( Exception e )
- {
- throw new AssemblyException( "Unable to create keystore.", e );
- }
- }
-
- private static void initializeKeyManager( KeyStore keyStore, String password )
- {
- try
- {
- KeyManagerFactory kmf = KeyManagerFactory.getInstance( KeyManagerFactory.getDefaultAlgorithm() );
- kmf.init( keyStore, password.toCharArray() );
- }
- catch( NoSuchAlgorithmException | KeyStoreException | UnrecoverableKeyException e )
- {
- throw new AssemblyException( "Unable to initialize KeyManager.", e );
- }
- }
-
- private static void createKeyStoreData( KeyStore keyStore, File keyFile, String type, String password )
- {
- try
- {
- if( keyStore.getCertificate( COMMON_NAME ) != null )
- {
- return;
- }
- KeyPair keyPair = generateKeyPair();
- X509Certificate certificate = selfSignedCertificate( keyPair, COMMON_NAME, 30 );
- keyStore.setCertificateEntry( COMMON_NAME, certificate );
- storeKeyStore(keyStore, keyFile, password, type);
-
- System.out.println("Created Self-signed certificated:");
- System.out.println(convertCertificateToPEM( certificate ));
- }
- catch( KeyStoreException e )
- {
- throw new AssemblyException( "Unable to store certificate in keystore.", e );
- }
- }
-
- private static void storeKeyStore( KeyStore keyStore, File keyFile, String password, String type )
- {
- try( FileOutputStream fos = new FileOutputStream( keyFile ) )
- {
- KeyStore ks = KeyStore.getInstance( type );
- char[] pwd = password.toCharArray();
- ks.load( null, pwd );
- ks.store( fos, pwd );
- }
- catch( Exception e )
- {
- throw new AssemblyException( "Unable to create keystore.", e );
- }
- }
-
- private static KeyPair generateKeyPair()
- {
- try
- {
- KeyPairGenerator keyGen = KeyPairGenerator.getInstance( "RSA" );
- keyGen.initialize( RSA_KEY_LEN );
- return keyGen.generateKeyPair();
- }
- catch( NoSuchAlgorithmException e )
- {
- throw new AssemblyException( "RSA encryption is not available on this system.", e );
- }
- }
-
- @SuppressWarnings( "unused" )
- private static PKCS10CertificationRequest generateCSR( KeyPair pair, String subjectDN )
- {
- try
- {
- X500Principal subject = new X500Principal( "CN=" + subjectDN );
- PublicKey publicKey = pair.getPublic();
- PKCS10CertificationRequestBuilder p10Builder = new JcaPKCS10CertificationRequestBuilder( subject, publicKey );
- JcaContentSignerBuilder csBuilder = new JcaContentSignerBuilder( "SHA256withRSA" );
- ContentSigner signer = csBuilder.build( pair.getPrivate() );
- return p10Builder.build( signer );
- }
- catch( Exception e )
- {
- throw new AssemblyException( "Unable to generate Certificate Signing Request", e );
- }
- }
-
- private static String convertCertificateToPEM( X509Certificate signedCertificate )
- {
- try( StringWriter signedCertificatePEMDataStringWriter = new StringWriter() )
- {
- JcaPEMWriter pemWriter = new JcaPEMWriter( signedCertificatePEMDataStringWriter );
- pemWriter.writeObject( signedCertificate );
- pemWriter.close();
- return signedCertificatePEMDataStringWriter.toString();
- }
- catch( IOException e )
- {
- throw new AssemblyException( "Unable to convert certificate to PEM string.", e );
- }
- }
-
- private static X509Certificate selfSignedCertificate( KeyPair keyPair, String subjectDN, @SuppressWarnings( "SameParameterValue" ) int days )
- {
- try
- {
- Provider bcProvider = new BouncyCastleProvider();
- Security.addProvider( bcProvider );
-
- long now = System.currentTimeMillis();
- Date startDate = new Date( now );
- Date endDate = new Date( now + days * 25 * 3_600_000L );
-
- X500Name dnName = new X500Name( "CN=" + subjectDN );
- BigInteger certSerialNumber = new BigInteger( Long.toString( now ) );
- String signatureAlgorithm = "SHA256WithRSA"; // <-- Use appropriate signature algorithm based on your keyPair algorithm.
- ContentSigner contentSigner = new JcaContentSignerBuilder( signatureAlgorithm ).build( keyPair.getPrivate() );
- JcaX509v3CertificateBuilder certBuilder =
- new JcaX509v3CertificateBuilder( dnName, certSerialNumber, startDate, endDate, dnName, keyPair.getPublic() );
-
- // Basic Constraints
- certBuilder.addExtension(
- new ASN1ObjectIdentifier( "2.5.29.19" ),
- true,
- new BasicConstraints( true ) ); // Basic Constraints is usually marked as critical.
-
- // Key Usage constraints
- certBuilder.addExtension(
- new ASN1ObjectIdentifier( "2.5.29.15" ),
- true,
- new X509KeyUsage(
- X509KeyUsage.digitalSignature |
- X509KeyUsage.keyCertSign |
- X509KeyUsage.nonRepudiation |
- X509KeyUsage.keyEncipherment |
- X509KeyUsage.dataEncipherment ) );
-
- return new JcaX509CertificateConverter().setProvider( bcProvider ).getCertificate( certBuilder.build( contentSigner ) );
- }
- catch( Exception e )
- {
- throw new AssemblyException( "Unable to self-sign certificate.", e );
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
index 40d3dfd..ad03b15 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
@@ -45,13 +45,7 @@ public class <%= polygene.name %>Launcher extends PolygeneRestApplicationLaunche
protected LayeredApplicationAssembler createApplicationAssembler()
throws AssemblyException
{
-<% if( polygene.hasFeature( 'security' ) ) {
-%> if( mode == Application.Mode.development )
- {
- DevelopmentKeyManagement.initializeKeyStore();
- }
-<% }
-%> return new <%= polygene.name %>ApplicationAssembler( name, version, mode, none -> {} );
+ return new <%= polygene.name %>ApplicationAssembler( name, version, mode, none -> {} );
}
@Override
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/app.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/app.js b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
index 610b9af..03ddff9 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
@@ -33,10 +33,8 @@ module.exports = {
'app/src/main/java/' + p.javaPackageDir + '/app/' + p.name + 'Launcher.java');
if (p.hasFeature('security')) {
- p.copyTemplate(p.ctx,
- 'RestAPIApplication/DevelopmentKeyManagement.java.tmpl',
- 'app/src/main/java/' + p.javaPackageDir + '/app/DevelopmentKeyManagement.java');
p.copyToConfig(p.ctx, 'RestAPIApplication/web-shiro.ini.tmpl', 'web-shiro.ini');
+ p.copyToConfig(p.ctx, 'RestAPIApplication/dev-keystore.p12', 'security/keystore-' + p.name + '.p12');
}
p.copyTemplate(p.ctx,
@@ -51,15 +49,13 @@ module.exports = {
'RestAPIApplication/SETUP.tmpl',
'SETUP.txt');
- p.ctx.fs.copy(
- p.ctx.templatePath('RestAPIApplication/customUnixStartScript.txt'),
- p.ctx.destinationPath('app/src/scripts/customUnixStartScript.txt')
- );
+ p.copyTemplate(p.ctx,
+ 'RestAPIApplication/customUnixStartScript.txt.tmpl',
+ 'app/src/scripts/customUnixStartScript.txt.tmpl');
- p.ctx.fs.copy(
- p.ctx.templatePath('RestAPIApplication/customWindowsStartScript.txt'),
- p.ctx.destinationPath('app/src/scripts/customWindowsStartScript.txt')
- );
+ p.copyTemplate(p.ctx,
+ 'RestAPIApplication/customWindowsStartScript.txt.tmpl',
+ 'app/src/scripts/customWindowsStartScript.txt.tmpl');
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
index 59d6751..a0cad7a 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl
@@ -91,10 +91,7 @@ public class BootstrapTest
protected LayeredApplicationAssembler createApplicationAssembler()
throws AssemblyException
{
-<% if( polygene.hasFeature( 'security' ) ) {
-%> DevelopmentKeyManagement.initializeKeyStore();
-<% }
-%> return new <%= polygene.name %>ApplicationAssembler( "LaunchTest", "0", Application.Mode.development, BootstrapTest.this::setupTest )
+ return new <%= polygene.name %>ApplicationAssembler( "LaunchTest", "0", Application.Mode.development, BootstrapTest.this::setupTest )
{
@Override
protected void onModelCreated( ApplicationDescriptor model )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt b/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
deleted file mode 100644
index fd23f57..0000000
--- a/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-## ${applicationName} start up script for UN*X
-##
-##############################################################################
-
-# default to 'development' mode
-if [ -z \$APP_MODE ] ; then
- export APP_MODE=development
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: \$0 may be a link
-PRG="\$0"
-# Need this for relative symlinks.
-while [ -h "\$PRG" ] ; do
- ls=`ls -ld "\$PRG"`
- link=`expr "\$ls" : '.*-> \\(.*\\)\$'`
- if expr "\$link" : '/.*' > /dev/null; then
- PRG="\$link"
- else
- PRG=`dirname "\$PRG"`"/\$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"\$PRG\"`/${appHomeRelativePath}" >/dev/null
-APP_HOME="`pwd -P`"
-cd "\$SAVED" >/dev/null
-
-APP_NAME="${applicationName}"
-APP_BASE_NAME=`basename "\$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
-DEFAULT_JVM_OPTS=${defaultJvmOpts}
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "\$*"
-}
-
-die () {
- echo
- echo "\$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=\$APP_HOME/config/\$APP_MODE:$classpath
-
-# Determine the Java command to use to start the JVM.
-if [ -n "\$JAVA_HOME" ] ; then
- if [ -x "\$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="\$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="\$JAVA_HOME/bin/java"
- fi
- if [ ! -x "\$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: \$JAVA_HOME
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "\$cygwin" = "false" -a "\$darwin" = "false" -a "\$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ \$? -eq 0 ] ; then
- if [ "\$MAX_FD" = "maximum" -o "\$MAX_FD" = "max" ] ; then
- MAX_FD="\$MAX_FD_LIMIT"
- fi
- ulimit -n \$MAX_FD
- if [ \$? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: \$MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: \$MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if \$darwin; then
- GRADLE_OPTS="\$GRADLE_OPTS \\"-Xdock:name=\$APP_NAME\\" \\"-Xdock:icon=\$APP_HOME/media/gradle.icns\\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if \$cygwin ; then
- APP_HOME=`cygpath --path --mixed "\$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "\$CLASSPATH"`
- JAVACMD=`cygpath --unix "\$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in \$ROOTDIRSRAW ; do
- ROOTDIRS="\$ROOTDIRS\$SEP\$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^(\$ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "\$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="\$OURCYGPATTERN|(\$GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "\$@" ; do
- CHECK=`echo "\$arg"|egrep -c "\$OURCYGPATTERN" -`
- CHECK2=`echo "\$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ \$CHECK -ne 0 ] && [ \$CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args\$i`=`cygpath --path --ignore --mixed "\$arg"`
- else
- eval `echo args\$i`="\"\$arg\""
- fi
- i=\$((i+1))
- done
- case \$i in
- (0) set -- ;;
- (1) set -- "\$args0" ;;
- (2) set -- "\$args0" "\$args1" ;;
- (3) set -- "\$args0" "\$args1" "\$args2" ;;
- (4) set -- "\$args0" "\$args1" "\$args2" "\$args3" ;;
- (5) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" ;;
- (6) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" ;;
- (7) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" ;;
- (8) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" ;;
- (9) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" "\$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\\\n "\$i" | sed "s/'/'\\\\\\\\''/g;1s/^/'/;\\\$s/\\\$/' \\\\\\\\/" ; done
- echo " "
-}
-APP_ARGS=\$(save "\$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "\$(uname)" = "Darwin" ] && [ "\$HOME" = "\$PWD" ]; then
- cd "\$(dirname "\$0")"
-fi
-
-exec "\$JAVACMD" "\$@"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt.tmpl
new file mode 100644
index 0000000..e2867fd
--- /dev/null
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt.tmpl
@@ -0,0 +1,175 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## ${applicationName} start up script for UN*X
+##
+##############################################################################
+
+# default to 'development' mode
+if [ -z \$APP_MODE ] ; then
+ export APP_MODE=development
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: \$0 may be a link
+PRG="\$0"
+# Need this for relative symlinks.
+while [ -h "\$PRG" ] ; do
+ ls=`ls -ld "\$PRG"`
+ link=`expr "\$ls" : '.*-> \\(.*\\)\$'`
+ if expr "\$link" : '/.*' > /dev/null; then
+ PRG="\$link"
+ else
+ PRG=`dirname "\$PRG"`"/\$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"\$PRG\"`/${appHomeRelativePath}" >/dev/null
+APP_HOME="`pwd -P`"
+cd "\$SAVED" >/dev/null
+
+APP_NAME="${applicationName}"
+APP_BASE_NAME=`basename "\$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "\$*"
+}
+
+die () {
+ echo
+ echo "\$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=\$APP_HOME/config/\$APP_MODE:$classpath
+
+# Determine the Java command to use to start the JVM.
+if [ -n "\$JAVA_HOME" ] ; then
+ if [ -x "\$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="\$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="\$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "\$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: \$JAVA_HOME
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "\$cygwin" = "false" -a "\$darwin" = "false" -a "\$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ \$? -eq 0 ] ; then
+ if [ "\$MAX_FD" = "maximum" -o "\$MAX_FD" = "max" ] ; then
+ MAX_FD="\$MAX_FD_LIMIT"
+ fi
+ ulimit -n \$MAX_FD
+ if [ \$? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: \$MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: \$MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if \$darwin; then
+ GRADLE_OPTS="\$GRADLE_OPTS \\"-Xdock:name=\$APP_NAME\\" \\"-Xdock:icon=\$APP_HOME/media/gradle.icns\\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if \$cygwin ; then
+ APP_HOME=`cygpath --path --mixed "\$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "\$CLASSPATH"`
+ JAVACMD=`cygpath --unix "\$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in \$ROOTDIRSRAW ; do
+ ROOTDIRS="\$ROOTDIRS\$SEP\$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^(\$ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "\$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="\$OURCYGPATTERN|(\$GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "\$@" ; do
+ CHECK=`echo "\$arg"|egrep -c "\$OURCYGPATTERN" -`
+ CHECK2=`echo "\$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ \$CHECK -ne 0 ] && [ \$CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args\$i`=`cygpath --path --ignore --mixed "\$arg"`
+ else
+ eval `echo args\$i`="\"\$arg\""
+ fi
+ i=\$((i+1))
+ done
+ case \$i in
+ (0) set -- ;;
+ (1) set -- "\$args0" ;;
+ (2) set -- "\$args0" "\$args1" ;;
+ (3) set -- "\$args0" "\$args1" "\$args2" ;;
+ (4) set -- "\$args0" "\$args1" "\$args2" "\$args3" ;;
+ (5) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" ;;
+ (6) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" ;;
+ (7) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" ;;
+ (8) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" ;;
+ (9) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" "\$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\\\n "\$i" | sed "s/'/'\\\\\\\\''/g;1s/^/'/;\\\$s/\\\$/' \\\\\\\\/" ; done
+ echo " "
+}
+APP_ARGS=\$(save "\$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <%% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <%% } %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "\$(uname)" = "Darwin" ] && [ "\$HOME" = "\$PWD" ]; then
+ cd "\$(dirname "\$0")"
+fi
+
+exec "\$JAVACMD" "\$@"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt b/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
deleted file mode 100644
index e891013..0000000
--- a/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem ${applicationName} startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.\
-
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%${appHomeRelativePath}
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=${defaultJvmOpts}
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto setmode
-
-set CMD_LINE_ARGS=%*
-
-:setmode
-if "x%APP_MODE%" <> "x" goto execute
-set APP_MODE=development
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\\config\\%APP_MODE%;$classpath
-
-@rem Execute ${applicationName}
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %${optsEnvironmentVar}% <% if ( appNameSystemProperty ) { %>"-D${appNameSystemProperty}=%APP_BASE_NAME%"<% } %> -classpath "%CLASSPATH%" ${mainClassName} %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable ${exitEnvironmentVar} if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%${exitEnvironmentVar}%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt.tmpl
new file mode 100644
index 0000000..8f262bc
--- /dev/null
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt.tmpl
@@ -0,0 +1,89 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem ${applicationName} startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%${appHomeRelativePath}
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto setmode
+
+set CMD_LINE_ARGS=%*
+
+:setmode
+if "x%APP_MODE%" <> "x" goto execute
+set APP_MODE=development
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\\config\\%APP_MODE%;$classpath
+
+@rem Execute ${applicationName}
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %${optsEnvironmentVar}% <%% if ( appNameSystemProperty ) { %>"-D${appNameSystemProperty}=%APP_BASE_NAME%"<%% } %> -classpath "%CLASSPATH%" ${mainClassName} %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable ${exitEnvironmentVar} if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%${exitEnvironmentVar}%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/app/templates/RestAPIApplication/dev-keystore.p12
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/dev-keystore.p12 b/tools/generator-polygene/app/templates/RestAPIApplication/dev-keystore.p12
new file mode 100644
index 0000000..2225309
Binary files /dev/null and b/tools/generator-polygene/app/templates/RestAPIApplication/dev-keystore.p12 differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/29ecdba0/tools/generator-polygene/src/docs/yeoman_polygene.txt
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/src/docs/yeoman_polygene.txt b/tools/generator-polygene/src/docs/yeoman_polygene.txt
index 388aea2..85e50a7 100644
--- a/tools/generator-polygene/src/docs/yeoman_polygene.txt
+++ b/tools/generator-polygene/src/docs/yeoman_polygene.txt
@@ -359,7 +359,6 @@ we will create a complete project, like this
create bootstrap/src/main/java/com/sensetif/sink/bootstrap/connectivity/ConnectivityLayer.java
create rest/src/main/java/com/sensetif/sink/rest/FloodRestApplication.java
create app/src/main/java/com/sensetif/sink/app/FloodLauncher.java
- create app/src/main/java/com/sensetif/sink/app/DevelopmentKeyManagement.java
create app/src/main/config/development/web-shiro.ini
create app/src/main/config/qa/web-shiro.ini
create app/src/main/config/staging/web-shiro.ini
[16/50] [abbrv] polygene-java git commit: Get rid of warnings,
and some reformatting of a messy class.
Posted by pa...@apache.org.
Get rid of warnings, and some reformatting of a messy class.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/58b81749
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/58b81749
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/58b81749
Branch: refs/heads/master
Commit: 58b81749bfe27d204d85154f64fcc9806331701b
Parents: 002fb1c
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:36:19 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:36:19 2017 +0800
----------------------------------------------------------------------
.../support/skeletons/AbstractSQLIndexing.java | 281 ++++++++++---------
1 file changed, 141 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/58b81749/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
index 47e0503..a250d66 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLIndexing.java
@@ -87,13 +87,16 @@ public abstract class AbstractSQLIndexing
implements SQLIndexing
{
- public static final Integer AMOUNT_OF_COLUMNS_IN_ENTITY_TABLE = 5;
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ENTITY_TABLE = 5;
- public static final Integer AMOUNT_OF_COLUMNS_IN_ALL_QNAMES_TABLE = 2;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ALL_QNAMES_TABLE = 2;
- public static final Integer AMOUNT_OF_COLUMNS_IN_ASSO_TABLE = 2;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_ASSO_TABLE = 2;
- public static final Integer AMOUNT_OF_COLUMNS_IN_MANY_ASSO_TABLE = 3;
+ @SuppressWarnings( "WeakerAccess" )
+ protected static final Integer AMOUNT_OF_COLUMNS_IN_MANY_ASSO_TABLE = 3;
@Structure
private Application _app;
@@ -299,10 +302,11 @@ public abstract class AbstractSQLIndexing
}
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createInsertStatement( String schemaName, String tableName,
Integer amountOfColumns,
SQLVendor vendor
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -315,16 +319,14 @@ public abstract class AbstractSQLIndexing
}
return m.insert().setTableName( t.tableName( schemaName, tableName ) )
- .setColumnSource( columnBuilder.createExpression() ).createExpression();
+ .setColumnSource( columnBuilder.createExpression() ).createExpression();
}
protected abstract InsertStatement createInsertStatementWithAutoGeneratedIDForEntitiesTable(
- String schemaName, String tableName, SQLVendor vendor
- );
+ String schemaName, String tableName, SQLVendor vendor );
- protected void addEntityInfoToInsertToEntityTablePS( EntityState state, PreparedStatement ps,
- int startingIndex
- )
+ @SuppressWarnings( "SameParameterValue" )
+ protected void addEntityInfoToInsertToEntityTablePS( EntityState state, PreparedStatement ps, int startingIndex )
throws SQLException
{
ps.setString( startingIndex, state.entityReference().identity().toString() );
@@ -333,9 +335,8 @@ public abstract class AbstractSQLIndexing
ps.setString( startingIndex + 3, this._app.version() );
}
- protected Long findEntityPK( EntityState state,
- Lazy<PreparedStatement, SQLException> queryPKPS
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected Long findEntityPK( EntityState state, Lazy<PreparedStatement, SQLException> queryPKPS )
throws SQLException
{
// TODO build cache: Polygene Identity -> PK
@@ -363,11 +364,11 @@ public abstract class AbstractSQLIndexing
protected abstract long getPKFromAutoGeneratedIDInsert(
EntityState state, PreparedStatement autoGeneratedIDStatement, SQLVendor vendor,
Connection connection
- )
+ )
throws SQLException;
- protected UpdateStatement
- createUpdateEntityTableStatement( String schemaName, SQLVendor vendor )
+ @SuppressWarnings( "WeakerAccess" )
+ protected UpdateStatement createUpdateEntityTableStatement( String schemaName, SQLVendor vendor )
{
ModificationFactory m = vendor.getModificationFactory();
BooleanFactory b = vendor.getBooleanFactory();
@@ -397,9 +398,8 @@ public abstract class AbstractSQLIndexing
return builder.createExpression();
}
- protected QueryExpression createQueryEntityPkByIdentityStatement( String schemaName,
- SQLVendor vendor
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected QueryExpression createQueryEntityPkByIdentityStatement( String schemaName, SQLVendor vendor )
{
BooleanFactory b = vendor.getBooleanFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -421,25 +421,25 @@ public abstract class AbstractSQLIndexing
return q.createQuery( query.createExpression() );
}
- protected DeleteStatement createDeleteFromEntityTableStatement( String schemaName,
- SQLVendor vendor
- )
+ @SuppressWarnings( "WeakerAccess" )
+ protected DeleteStatement createDeleteFromEntityTableStatement( String schemaName, SQLVendor vendor )
{
return this.createDeleteFromTableStatement( schemaName, DBNames.ENTITY_TABLE_NAME,
DBNames.ENTITY_TABLE_IDENTITY_COLUMN_NAME, vendor );
}
- protected DeleteStatement
- createClearEntityDataStatement( String schemaName, SQLVendor vendor )
+ @SuppressWarnings( "WeakerAccess" )
+ protected DeleteStatement createClearEntityDataStatement( String schemaName, SQLVendor vendor )
{
return this.createDeleteFromTableStatement( schemaName, DBNames.ALL_QNAMES_TABLE_NAME,
DBNames.ENTITY_TABLE_PK_COLUMN_NAME, vendor );
}
+ @SuppressWarnings( "WeakerAccess" )
protected DeleteStatement createDeleteFromTableStatement( String schemaName, String tableName,
String columnName,
SQLVendor vendor
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
BooleanFactory b = vendor.getBooleanFactory();
@@ -452,12 +452,13 @@ public abstract class AbstractSQLIndexing
// ";" //
DeleteBySearchBuilder delete = m.deleteBySearch();
delete.setTargetTable( m.createTargetTable( t.tableName( schemaName, tableName ) ) )
- .getWhere()
- .reset( b.eq( c.colName( columnName ), l.param() ) );
+ .getWhere()
+ .reset( b.eq( c.colName( columnName ), l.param() ) );
return delete.createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createPropertyInsert( QNameInfo qNameInfo, SQLVendor vendor )
{
String tableName = qNameInfo.getTableName();
@@ -466,7 +467,7 @@ public abstract class AbstractSQLIndexing
LiteralFactory l = vendor.getLiteralFactory();
ColumnSourceByValuesBuilder columnBuilder = m.columnSourceByValues()
- .addValues( l.param(), l.param(), l.param() );
+ .addValues( l.param(), l.param(), l.param() );
if( qNameInfo.getCollectionDepth() > 0 )
{
columnBuilder.addValues( l.func( "text2ltree", l.param() ) );
@@ -474,12 +475,13 @@ public abstract class AbstractSQLIndexing
columnBuilder.addValues( l.param() );
return m.insert().setTableName( t.tableName( this._state.schemaName().get(), tableName ) )
- .setColumnSource( columnBuilder.createExpression() ).createExpression();
+ .setColumnSource( columnBuilder.createExpression() ).createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createAssoInsert( QNameInfo qNameInfo, SQLVendor vendor,
Integer amountOfParams
- )
+ )
{
ModificationFactory m = vendor.getModificationFactory();
LiteralFactory l = vendor.getLiteralFactory();
@@ -512,6 +514,7 @@ public abstract class AbstractSQLIndexing
.createExpression();
}
+ @SuppressWarnings( "WeakerAccess" )
protected InsertStatement createInsertEntityTypeStatement( String schemaName, SQLVendor vendor )
{
return this.createInsertStatement( schemaName, ENTITY_TYPES_JOIN_TABLE_NAME, 2, vendor );
@@ -520,7 +523,7 @@ public abstract class AbstractSQLIndexing
private void syncQNamesInsertPSs( Connection connection,
Map<QualifiedName, PreparedStatement> qNameInsertPSs,
Set<QualifiedName> qNames
- )
+ )
throws SQLException
{
Set<QualifiedName> copy = new HashSet<>( qNames );
@@ -530,8 +533,7 @@ public abstract class AbstractSQLIndexing
QNameInfo info = this._state.qNameInfos().get().get( qName );
if( info == null )
{
- throw new InternalError(
- "Could not find database information about qualified name [" + qName + "]" );
+ throw new SqlIndexingException( "Could not find database information about qualified name [" + qName + "]" );
}
QNameType type = info.getQNameType();
@@ -549,8 +551,7 @@ public abstract class AbstractSQLIndexing
}
else
{
- throw new IllegalArgumentException( "Did not know what to do with QName of type "
- + type + "." );
+ throw new SqlIndexingException( "Did not know what to do with QName of type " + type + "." );
}
}
}
@@ -575,7 +576,7 @@ public abstract class AbstractSQLIndexing
private PreparedStatement createInsertManyAssociationPS( Connection connection,
QNameInfo qNameInfo
- )
+ )
throws SQLException
{
SQLVendor vendor = this.descriptor.metaInfo( SQLVendor.class );
@@ -594,34 +595,34 @@ public abstract class AbstractSQLIndexing
private Integer insertPropertyQNames( Connection connection,
Map<QualifiedName, PreparedStatement> qNameInsertPSs,
PreparedStatement insertAllQNamesPS, EntityState state, Long entityPK
- )
+ )
throws SQLException
{
Set<QualifiedName> qNames = this._state.entityUsedQNames().get().get( state.entityDescriptor() );
this.syncQNamesInsertPSs( connection, qNameInsertPSs, qNames );
- final Integer propertyPK[] = {0};
+ final Integer propertyPK[] = { 0 };
state.entityDescriptor().state().properties()
- .filter( pDesc -> SQLSkeletonUtil.isQueryable( pDesc.accessor() ) )
- .forEach( pDesc -> {
- try
- {
- propertyPK[0] = this.insertProperty(
- qNameInsertPSs,
- insertAllQNamesPS,
- propertyPK[0],
- entityPK,
- pDesc.qualifiedName(),
- state.propertyValueOf( pDesc.qualifiedName() ),
- null //
- );
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting property " + pDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
- return propertyPK[0];
+ .filter( pDesc -> SQLSkeletonUtil.isQueryable( pDesc.accessor() ) )
+ .forEach( pDesc -> {
+ try
+ {
+ propertyPK[ 0 ] = this.insertProperty(
+ qNameInsertPSs,
+ insertAllQNamesPS,
+ propertyPK[ 0 ],
+ entityPK,
+ pDesc.qualifiedName(),
+ state.propertyValueOf( pDesc.qualifiedName() ),
+ null //
+ );
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting property " + pDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
+ return propertyPK[ 0 ];
}
private void insertAssoAndManyAssoQNames( Map<QualifiedName, PreparedStatement> qNameInsertPSs,
@@ -629,71 +630,71 @@ public abstract class AbstractSQLIndexing
EntityState state,
final Integer localPK,
Long entityPK
- )
+ )
throws SQLException
{
- final Integer[] qNamePK = {localPK};
+ final Integer[] qNamePK = { localPK };
state.entityDescriptor().state().associations()
- .filter( aDesc -> SQLSkeletonUtil.isQueryable( aDesc.accessor() ) )
- .forEach( aDesc -> {
- try
- {
- QualifiedName qName = aDesc.qualifiedName();
- PreparedStatement ps = qNameInsertPSs.get( qName );
- EntityReference ref = state.associationValueOf( qName );
- if( ref != null )
- {
- insertToAllQNamesPS.setInt( 1, qNamePK[0] );
- insertToAllQNamesPS.setLong( 2, entityPK );
- insertToAllQNamesPS.addBatch();
-
- ps.setInt( 1, qNamePK[0] );
- ps.setLong( 2, entityPK );
- ps.setString( 3, ref.identity().toString() );
- ps.addBatch();
-
- qNamePK[0] += 1;
- }
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting association " + aDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
+ .filter( aDesc -> SQLSkeletonUtil.isQueryable( aDesc.accessor() ) )
+ .forEach( aDesc -> {
+ try
+ {
+ QualifiedName qName = aDesc.qualifiedName();
+ PreparedStatement ps = qNameInsertPSs.get( qName );
+ EntityReference ref = state.associationValueOf( qName );
+ if( ref != null )
+ {
+ insertToAllQNamesPS.setInt( 1, qNamePK[ 0 ] );
+ insertToAllQNamesPS.setLong( 2, entityPK );
+ insertToAllQNamesPS.addBatch();
+
+ ps.setInt( 1, qNamePK[ 0 ] );
+ ps.setLong( 2, entityPK );
+ ps.setString( 3, ref.identity().toString() );
+ ps.addBatch();
+
+ qNamePK[ 0 ] += 1;
+ }
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting association " + aDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
state.entityDescriptor().state().manyAssociations()
- .filter( mDesc -> SQLSkeletonUtil.isQueryable( mDesc.accessor() ) )
- .forEach( mDesc -> {
- try
- {
- QualifiedName qName = mDesc.qualifiedName();
- PreparedStatement ps = qNameInsertPSs.get( qName );
- Integer index = 0;
- for( EntityReference ref : state.manyAssociationValueOf( qName ) )
- {
- if( ref != null )
- {
- insertToAllQNamesPS.setInt( 1, qNamePK[0] );
- insertToAllQNamesPS.setLong( 2, entityPK );
- insertToAllQNamesPS.addBatch();
-
- ps.setInt( 1, qNamePK[0] );
- ps.setLong( 2, entityPK );
- ps.setInt( 3, index );
- ps.setString( 4, ref.identity().toString() );
- ps.addBatch();
- qNamePK[0] += 1;
- }
- ++index;
- }
- }
- catch( SQLException e )
- {
- throw new EntityStoreException( "Underlying exception when inserting manyassociation " + mDesc,
- SQLUtil.withAllSQLExceptions( e ) );
- }
- } );
+ .filter( mDesc -> SQLSkeletonUtil.isQueryable( mDesc.accessor() ) )
+ .forEach( mDesc -> {
+ try
+ {
+ QualifiedName qName = mDesc.qualifiedName();
+ PreparedStatement ps = qNameInsertPSs.get( qName );
+ Integer index = 0;
+ for( EntityReference ref : state.manyAssociationValueOf( qName ) )
+ {
+ if( ref != null )
+ {
+ insertToAllQNamesPS.setInt( 1, qNamePK[ 0 ] );
+ insertToAllQNamesPS.setLong( 2, entityPK );
+ insertToAllQNamesPS.addBatch();
+
+ ps.setInt( 1, qNamePK[ 0 ] );
+ ps.setLong( 2, entityPK );
+ ps.setInt( 3, index );
+ ps.setString( 4, ref.identity().toString() );
+ ps.addBatch();
+ qNamePK[ 0 ] += 1;
+ }
+ ++index;
+ }
+ }
+ catch( SQLException e )
+ {
+ throw new EntityStoreException( "Underlying exception when inserting manyassociation " + mDesc,
+ SQLUtil.withAllSQLExceptions( e ) );
+ }
+ } );
}
private Integer insertProperty(
@@ -704,7 +705,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
Integer result = propertyPK;
@@ -744,7 +745,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Collection<?> property,
Integer parentQNameID
- )
+ )
throws SQLException
{
QNameInfo info = this._state.qNameInfos().get().get( qName );
@@ -762,7 +763,7 @@ public abstract class AbstractSQLIndexing
private Integer storeCollectionInfo( PreparedStatement insertAllQNamesPS, Integer propertyPK,
Long entityPK,
Integer parentQNameID, PreparedStatement ps, QNameInfo info
- )
+ )
throws SQLException
{
insertAllQNamesPS.setInt( 1, propertyPK );
@@ -798,7 +799,7 @@ public abstract class AbstractSQLIndexing
Integer parentPK,
Type finalType,
Boolean isFinalTypePrimitive
- )
+ )
throws SQLException
{
Integer index = 0;
@@ -836,7 +837,7 @@ public abstract class AbstractSQLIndexing
Object item,
Boolean isFinalTypePrimitive,
Type finalType
- )
+ )
throws SQLException
{
insertAllQNamesPS.setInt( 1, propertyPK );
@@ -869,7 +870,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
QNameInfo info = this._state.qNameInfos().get().get( qName );
@@ -896,7 +897,7 @@ public abstract class AbstractSQLIndexing
QualifiedName qName,
Object property,
Integer parentQNameID
- )
+ )
throws SQLException
{
@@ -920,7 +921,7 @@ public abstract class AbstractSQLIndexing
Integer localPK,
Long entityPK,
Object property
- )
+ )
throws SQLException
{
ValueDescriptor vDesc = this._qi4SPI.valueDescriptorFor( property );
@@ -930,15 +931,15 @@ public abstract class AbstractSQLIndexing
try
{
- propertyPK[0] = this.insertProperty(
+ propertyPK[ 0 ] = this.insertProperty(
qNameInsertPSs,
insertAllQNamesPS,
- propertyPK[0],
+ propertyPK[ 0 ],
entityPK,
pDesc.qualifiedName(),
state.propertyFor( pDesc.accessor() ).get(),
localPK
- );
+ );
}
catch( SQLException e )
{
@@ -947,13 +948,13 @@ public abstract class AbstractSQLIndexing
}
} );
- return propertyPK[0];
+ return propertyPK[ 0 ];
}
private void storePrimitiveUsingPS( PreparedStatement ps, Integer nextFreeIndex,
Object primitive,
Type primitiveType
- )
+ )
throws SQLException
{
if( primitiveType instanceof ParameterizedType )
@@ -968,7 +969,7 @@ public abstract class AbstractSQLIndexing
nextFreeIndex,
this._state.enumPKs().get().get(
QualifiedName.fromClass( (Class<?>) primitiveType, primitive.toString() ).toString() )
- );
+ );
}
else
{
@@ -999,7 +1000,7 @@ public abstract class AbstractSQLIndexing
EntityState state,
Long entityPK,
Map<Long, Integer> qNamePKs
- )
+ )
throws SQLException
{
@@ -1024,7 +1025,7 @@ public abstract class AbstractSQLIndexing
EntityState state,
Long entityPK,
Map<Long, Integer> qNamePKs
- )
+ )
throws SQLException
{
Integer nextQnamePK = this.insertPropertyQNames( connection,
@@ -1047,9 +1048,9 @@ public abstract class AbstractSQLIndexing
Integer typePK = this._state.entityTypePKs().get().get( clazz.getName() );
if( typePK == null )
{
- throw new InternalError( "Tried to get entity : " + clazz
- + ", but only aware of the following entities: "
- + this._state.entityTypePKs().get().keySet() );
+ throw new SqlIndexingException( "Tried to get entity : " + clazz
+ + ", but only aware of the following entities: "
+ + this._state.entityTypePKs().get().keySet() );
}
try
{
@@ -1059,7 +1060,7 @@ public abstract class AbstractSQLIndexing
}
catch( SQLException e )
{
- throw new EntityStoreException( "Underlying Exception when inserting " + entityPK,
+ throw new SqlIndexingException( "Underlying Exception when inserting " + entityPK,
SQLUtil.withAllSQLExceptions( e ) );
}
} );
[45/50] [abbrv] polygene-java git commit: Add missing Rat™ exclude rule for p12 Keystores
Posted by pa...@apache.org.
Add missing Rat™ exclude rule for p12 Keystores
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/82dd636e
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/82dd636e
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/82dd636e
Branch: refs/heads/master
Commit: 82dd636eba0043481c098c7ff0e46c6469266293
Parents: ec2855f
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 10:54:11 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 10:54:11 2017 +0200
----------------------------------------------------------------------
.../gradle/structure/distributions/DistributionsPlugin.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/82dd636e/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index 3cef75e..c4d9c35 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -284,7 +284,7 @@ class DistributionsPlugin implements Plugin<Project>
// Graphic Resources
'**/*.svg', '**/*.gif', '**/*.png', '**/*.jpg', '**/*.psd',
// Keystores
- '**/*.jceks',
+ '**/*.jceks', '**/*.p12',
// Syntax Highlighter - MIT
'manual/**/sh*.css', 'manual/**/sh*.js',
// jQuery & plugins - MIT
[03/50] [abbrv] polygene-java git commit: Fixing the restlet library
in relation to the polygene generator to work.
Posted by pa...@apache.org.
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
new file mode 100644
index 0000000..9977b93
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
@@ -0,0 +1,54 @@
+/*
+ * 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.restlet.assembly.infrastructue;
+
+import org.apache.polygene.api.common.Visibility;
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.index.rdf.assembly.RdfNativeSesameStoreAssembler;
+import org.apache.polygene.library.rdf.repository.NativeConfiguration;
+
+public class IndexingModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "Indexing Module";
+ private final ModuleAssembly configModule;
+
+ public IndexingModule( ModuleAssembly configModule )
+ {
+ this.configModule = configModule;
+ }
+
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+// new FileConfigurationAssembler().assemble( module );
+// new ESFilesystemIndexQueryAssembler()
+// .visibleIn( Visibility.application )
+// .withConfig( configModule, Visibility.application )
+// .assemble( module );
+
+ configModule.entities( NativeConfiguration.class ).visibleIn( Visibility.application );
+ new RdfNativeSesameStoreAssembler(Visibility.application, Visibility.module).assemble( module );
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
new file mode 100644
index 0000000..7d98ff3
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
@@ -0,0 +1,54 @@
+/*
+ * 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.restlet.assembly.infrastructue;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
+import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;
+import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;
+
+public class InfrastructureLayer extends LayeredLayerAssembler
+ implements LayerAssembler
+{
+ public static final String NAME = "Infrastructure Layer";
+ private final ModuleAssembly configModule;
+
+ public static InfrastructureLayer create( LayerAssembly layer )
+ {
+ ModuleAssembly config = layer.application().layer( ConfigurationLayer.NAME ).module( ConfigurationModule.NAME );
+ return new InfrastructureLayer( config );
+ }
+
+ public InfrastructureLayer( ModuleAssembly configModule )
+ {
+ this.configModule = configModule;
+ }
+
+ @Override
+ public LayerAssembly assemble( LayerAssembly layer )
+ {
+ new IndexingModule( configModule ).assemble( layer, layer.module( IndexingModule.NAME ) );
+ new SerializationModule().assemble( layer, layer.module( SerializationModule.NAME ) );
+ return layer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
new file mode 100644
index 0000000..85bb76d
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/SerializationModule.java
@@ -0,0 +1,37 @@
+/*
+ * 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.restlet.assembly.infrastructue;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+
+public class SerializationModule
+ implements ModuleAssembler
+{
+ public static final String NAME = "Serialization Module";
+
+ @Override
+ public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
+ {
+ return module;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
new file mode 100644
index 0000000..a209315
--- /dev/null
+++ b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/resource/ResourceLayer.java
@@ -0,0 +1,37 @@
+/*
+ * 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.restlet.assembly.resource;
+
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.layered.LayerAssembler;
+import org.apache.polygene.bootstrap.layered.LayeredLayerAssembler;
+
+public class ResourceLayer extends LayeredLayerAssembler
+ implements LayerAssembler
+{
+ public static final String NAME = "Resource Layer";
+
+ @Override
+ public LayerAssembly assemble( LayerAssembly layer )
+ {
+ return layer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index d39b3c9..c7e161e 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -19,9 +19,7 @@
-%>
package <%= polygene.packageName %>.bootstrap.connectivity;
-import java.io.File;
import java.util.HashMap;
-import javax.servlet.Servlet;
<% if( hasFeature('security') ) { %>
import org.apache.polygene.library.http.SecureJettyConfiguration;
import org.apache.polygene.library.http.SecureJettyServiceAssembler;
@@ -36,7 +34,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
-import org.restlet.ext.servlet.ServerServlet;
+import org.apache.polygene.library.restlet.PolygeneServerServlet;
import <%= polygene.packageName %>.rest.<%= polygene.name %>RestApplication;
@@ -61,7 +59,6 @@ public class HttpServerModule
public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
throws AssemblyException
{
- module.services( Servlet.class ).withMixins( ServerServlet.class );
<% if( hasFeature('security') ) {
%> new HttpShiroAssembler()
.withConfig( module, Visibility.module );
@@ -89,7 +86,7 @@ public class HttpServerModule
defaults.port().set( DEFAULT_PORT );
HashMap<String, String> initParams = new HashMap<>();
initParams.put("org.restlet.application", <%= polygene.name %>RestApplication.class.getName() );
- addServlets( serve( "/" ).with(Servlet.class ).withInitParams( initParams ) ).to( module );
+ addServlets( serve( "/*" ).with(PolygeneServerServlet.class ).withInitParams( initParams ) ).to( module );
return module;
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl
deleted file mode 100644
index c24ddce..0000000
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullEnroler.tmpl
+++ /dev/null
@@ -1,32 +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 <%= polygene.packageName %>.rest.security;
-
-import org.restlet.data.ClientInfo;
-import org.restlet.security.Enroler;
-
-public class NullEnroler
- implements Enroler
-{
- @Override
- public void enrole( ClientInfo clientInfo )
- {
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl
deleted file mode 100644
index 5d6b349..0000000
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/NullVerifier.tmpl
+++ /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 <%= polygene.packageName %>.rest.security;
-
-import org.restlet.security.SecretVerifier;
-import org.restlet.security.Verifier;
-
-public class NullVerifier extends SecretVerifier
- implements Verifier
-{
-
- @Override
- public int verify( String user, char[] secret )
- {
- return RESULT_VALID;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
index 0594546..daa6755 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/bootstrap.tmpl
@@ -18,14 +18,12 @@
*
-%>
package <%= polygene.packageName %>.bootstrap.connectivity;
-
<% if( hasFeature('security') ) { %>
import <%= polygene.packageName %>.rest.security.DefaultEnroler;
import <%= polygene.packageName %>.rest.security.DefaultVerifier;
-<% } else { %>
-import <%= polygene.packageName %>.rest.security.NullEnroler;
-import <%= polygene.packageName %>.rest.security.NullVerifier;
<% } %>
+import <%= polygene.packageName %>.rest.<%= polygene.name %>RestApplication;
+import org.apache.polygene.api.common.Visibility;
import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
@@ -44,10 +42,10 @@ public class RestApiModule
{
<% if( hasFeature('security') ) { %>
module.objects( DefaultVerifier.class, DefaultEnroler.class);
-<% } else {%>
- module.objects( NullVerifier.class, NullEnroler.class);
<% } %>
new RestletCrudConnectivityAssembler().assemble( module );
+ module.objects( <%= polygene.name %>RestApplication.class )
+ .visibleIn( Visibility.layer );
module.values( EntryPoint.class );
module.values( /* add value types */ );
module.services( /* add services */ );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
index 8d4ad47..91e8104 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/RestApiModule/module.js
@@ -27,10 +27,6 @@ module.exports = {
copyFile(p, "DefaultEnroler");
copyFile(p, "DefaultVerifier");
}
- else {
- copyFile(p, "NullEnroler");
- copyFile(p, "NullVerifier");
- }
}
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
index 5afbdd7..d23b640 100644
--- a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/bootstrap.tmpl
@@ -23,6 +23,7 @@ import org.apache.polygene.bootstrap.AssemblyException;
import org.apache.polygene.bootstrap.LayerAssembly;
import org.apache.polygene.bootstrap.ModuleAssembly;
import org.apache.polygene.bootstrap.layered.ModuleAssembler;
+import org.apache.polygene.library.restlet.assembly.RestletCrudModuleAssembler;
<% for( var idx in polygene.current.cruds) {
%><%= "import " + polygene.packageName + ".model." + polygene.current.name + "." + polygene.current.cruds[idx].name + ";" %>
@@ -54,8 +55,7 @@ for( var idx in polygene.current.services) {
<%
} %>
-import static org.apache.polygene.api.common.Visibility.layer;
-import static org.apache.polygene.api.common.Visibility.application;
+import static org.apache.polygene.api.common.Visibility.*;
public class <%- firstUpper(polygene.current.name) %>Module
implements ModuleAssembler
@@ -69,8 +69,8 @@ if( polygene.current.cruds ) {
for( var value in polygene.current.cruds ) {
var crud = polygene.current.cruds[value];
%>
- <%- "module.values( " + crud.name + ".class )" + (crud.visibility ? ".visibleIn( " + crud.visibility +" )" : "" ) %>;
- <%- "module.entities( " + crud.name + ".class )" + (crud.visibility ? ".visibleIn( " + crud.visibility +" )" : "" ) %>;
+ new RestletCrudModuleAssembler( <%- crud.name %>.class )
+ .assemble( module );
<%
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
index 8b38091..e188755 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/application.java.tmpl
@@ -38,19 +38,13 @@ if( hasFeature('security') ) {
%>import <%= polygene.packageName %>.rest.security.DefaultEnroler;
import <%= polygene.packageName %>.rest.security.DefaultVerifier;
<%
-} else {
-%>import <%= polygene.packageName %>.rest.security.NullEnroler;
-import <%= polygene.packageName %>.rest.security.NullVerifier;
-<%
}
%>
public class <%= polygene.name %>RestApplication extends PolygeneRestApplication
{
- private static final String BASEPATH = "/<%= polygene.name.toLowerCase() %>/";
-
- public <%= polygene.name %>RestApplication( Context context )
+ public <%= polygene.name %>RestApplication()
{
- super( context );
+ super( "/<%= polygene.name.toLowerCase() %>/", createContext() );
}
@Override
@@ -61,11 +55,18 @@ for( var moduleName in polygene.modules) {
var module = polygene.modules[moduleName];
for( var idx2 in module.cruds ) {
var crud = module.cruds[idx2];
-%> addResourcePath( "<%= crud.name.toLowerCase() %>", <%= crud.name %>.class, BASEPATH );
+%> addResourcePath( "<%= crud.name.toLowerCase() %>", <%= crud.name %>.class, basePath );
<%
}
}
-%> System.out.println( "REST API defined;" );
+%> }
+
+ @Override
+ public synchronized void start()
+ throws Exception
+ {
+ super.start();
+ System.out.println( "REST API defined;" );
printRoutes( System.out );
}
@@ -74,7 +75,8 @@ for( var moduleName in polygene.modules) {
<% if( hasFeature('security') ) {
%> return objectFactory.newObject(DefaultVerifier.class, this);
<% } else {
-%> return objectFactory.newObject(NullVerifier.class, this);
+%> // Security was not specified during generation, and Verifier is not needed.
+ return null;
<% }
%> }
@@ -83,7 +85,13 @@ for( var moduleName in polygene.modules) {
<% if( hasFeature('security') ) {
%> return objectFactory.newObject(DefaultEnroler.class, this);
<% } else {
-%> return objectFactory.newObject(NullEnroler.class, this);
+%> // Security was not specified during generation, and Enroler is not needed.
+ return null;
<% }
%> }
+
+ private static Context createContext()
+ {
+ return new Context("<%= polygene.packageName %>.rest");
+ }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
index ad707f2..697a2b0 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
@@ -43,6 +43,7 @@ dependencies {
if( polygene.applicationtype === 'Rest API' ) {
%> implementation project( ":rest" )
implementation "org.apache.polygene.libraries:org.apache.polygene.library.restlet:$polygeneVersion"
+ runtimeOnly "org.restlet.jee:org.restlet.ext.servlet:$restletVersion"
<%
}
@@ -70,38 +71,37 @@ if( hasFeature( 'envisage' ) ) {
<%
}
if( polygene.entitystore == 'LevelDB' ) {
-%> implementation "org.fusesource.leveldbjni:leveldbjni-all:1.8"
+%> implementation "org.fusesource.leveldbjni:leveldbjni-all:$levelDbVersion"
<%
}
if( polygene.entitystore == 'DerbySQL' ) {
-%> implementation "org.apache.derby:derby:10.13.1.1"
+%> implementation "org.apache.derby:derby:$derbyVersion"
<%
}
if( polygene.entitystore == 'H2SQL' ) {
-%> implementation "com.h2database:h2:1.4.194"
+%> implementation "com.h2database:h2:$h2Version"
<%
}
if( polygene.entitystore == 'MySQL' ) {
-%> implementation "mysql:mysql-connector-java:6.0.6"
+%> implementation "mysql:mysql-connector-java:$mysqlVersion"
<%
}
if( polygene.entitystore == 'PostgreSQL' ) {
-%> implementation "org.postgresql:postgresql:42.0.0"
+%> implementation "org.postgresql:postgresql:$postgresVersion"
<%
}
if( polygene.entitystore == 'SQLite' ) {
-%> implementation "org.xerial:sqlite-jdbc:3.16.1"
+%> implementation "org.xerial:sqlite-jdbc:$sqliteVersion"
<%
}
%>
runtimeOnly "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
- runtimeOnly "org.restlet.jee:org.restlet.ext.servlet:2.3.4"
- runtimeOnly "org.apache.johnzon:johnzon-core:1.1.0"
- runtimeOnly "org.apache.johnzon:johnzon-mapper:1.1.0"
+ runtimeOnly "org.apache.johnzon:johnzon-core:$johnzonVersion"
+ runtimeOnly "org.apache.johnzon:johnzon-mapper:$johnzonVersion"
runtimeOnly "org.apache.geronimo.specs:geronimo-json_1.1_spec:1.0"
- implementation "ch.qos.logback:logback-classic:1.2.3"
- implementation "ch.qos.logback:logback-core:1.2.3"
+ runtimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
+ runtimeOnly "ch.qos.logback:logback-core:$logbackVersion"
testImplementation "org.apache.polygene.tools:org.apache.polygene.tool.model-detail:$polygeneVersion"
testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c6b89168/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
index 357b607..6ec2b7f 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
@@ -25,8 +25,35 @@ if( project.version == 'unspecified' )
rootProject.ext {
polygeneVersion = "<%= polygene.version %>"
+ logbackVersion = "1.2.3"
+ johnzonVersion = "1.1.0"
<% if( polygene.applicationtype === "Rest API" ) {
%> jettyVersion = "9.2.17.v20160517"
+ restletVersion = "2.3.4"
+<%
+}
+if( polygene.entitystore == 'DerbySQL' ) {
+%> derbyVersion "10.13.1.1"
+<%
+}
+if( polygene.entitystore == 'H2SQL' ) {
+%> h2Version = "1.4.194"
+<%
+}
+if( polygene.entitystore == 'MySQL' ) {
+%> mysqlVersion = "6.0.6"
+<%
+}
+if( polygene.entitystore == 'PostgreSQL' ) {
+%> postgresVersion = "42.0.0"
+<%
+}
+if( polygene.entitystore == 'LevelDB' ) {
+%> levelDbVersion = "1.8"
+<%
+}
+if( polygene.entitystore == 'SQLite' ) {
+%> sqliteVersion = "3.16.1"
<%
}
%>}
[40/50] [abbrv] polygene-java git commit: Make Rat™ Happy
Posted by pa...@apache.org.
Make Rat™ Happy
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/503fa867
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/503fa867
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/503fa867
Branch: refs/heads/master
Commit: 503fa86709a170cdbd4f6b810c4ddbada27bcb3d
Parents: b672ffc
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Jul 16 20:59:18 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Jul 16 20:59:18 2017 +0200
----------------------------------------------------------------------
.../polygene/api/indexing/IndexingException.java | 17 +++++++++++++++++
.../support/skeletons/SqlIndexingException.java | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/503fa867/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
index 59bacdb..d9764e8 100644
--- a/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
+++ b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
@@ -1,3 +1,20 @@
+/*
+ * 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.api.indexing;
/**
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/503fa867/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
index 7970590..31de389 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
@@ -1,3 +1,20 @@
+/*
+ * 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.index.sql.support.skeletons;
import org.apache.polygene.api.indexing.IndexingException;
[49/50] [abbrv] polygene-java git commit: Merge branch
'release/3.0.0-RC2'
Posted by pa...@apache.org.
Merge branch 'release/3.0.0-RC2'
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/6f4e6667
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/6f4e6667
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/6f4e6667
Branch: refs/heads/master
Commit: 6f4e6667a265b3c692b2cc1a9bc3ff66c45e1299
Parents: 7db51ad 357eb4e
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 13:51:53 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 13:51:53 2017 +0200
----------------------------------------------------------------------
buildSrc/build.gradle | 4 +-
.../polygene/gradle/code/CodePlugin.groovy | 16 +-
.../DependenciesDeclarationExtension.groovy | 1 +
.../gradle/structure/ProjectGroupTasks.groovy | 36 +
.../polygene/gradle/structure/RootPlugin.groovy | 23 +
.../gradle/structure/core/CorePlugin.groovy | 3 +
.../distributions/DistributionsPlugin.groovy | 56 +-
.../structure/extensions/ExtensionPlugin.groovy | 3 +
.../internals/InternalDockerPlugin.groovy | 2 +-
.../structure/internals/InternalPlugin.groovy | 10 +-
.../structure/libraries/LibraryPlugin.groovy | 5 +
.../manual/AsciidocBuildInfoPlugin.groovy | 10 +-
.../structure/release/ReleasePlugin.groovy | 1 +
.../reports/AggregatedJacocoReportTask.groovy | 2 +-
.../structure/samples/SamplePlugin.groovy | 3 +
.../tests/PerformanceTestsPlugin.groovy | 2 +-
.../gradle/structure/tools/ToolPlugin.groovy | 3 +
.../structure/tutorials/TutorialPlugin.groovy | 3 +
.../gradle-plugins/polygene-internal.properties | 2 +-
core/api/build.gradle | 1 +
core/api/src/docs/api.txt | 2 +-
core/api/src/docs/composition.txt | 10 +-
core/api/src/docs/dependency-injection.txt | 136 +++
core/api/src/docs/fragment.txt | 10 +-
core/api/src/docs/layer.txt | 24 +
core/api/src/docs/module.txt | 12 +
core/api/src/docs/serialization.txt | 1 +
core/api/src/docs/structure.txt | 35 +-
core/api/src/docs/visibility.txt | 16 +
.../org/apache/polygene/api/PolygeneAPI.java | 8 +-
.../association/AssociationStateDescriptor.java | 6 +
.../api/association/ManyAssociation.java | 41 +-
.../api/association/NamedAssociation.java | 13 +-
.../polygene/api/common/QualifiedName.java | 2 -
.../api/composite/NoSuchCompositeException.java | 56 -
.../composite/NoSuchCompositeTypeException.java | 143 +++
.../api/composite/NoSuchTransientException.java | 42 -
.../composite/NoSuchTransientTypeException.java | 43 +
.../polygene/api/composite/PropertyMapper.java | 4 +-
.../polygene/api/composite/StateDescriptor.java | 2 +
.../api/composite/TransientBuilderFactory.java | 8 +-
.../api/configuration/Configuration.java | 222 ++--
.../configuration/ConfigurationComposite.java | 2 +-
.../NoSuchConfigurationTypeException.java | 36 +
.../api/constraint/ConstraintViolation.java | 56 -
.../ConstraintViolationException.java | 314 +++---
.../constraint/ValueConstraintViolation.java | 79 ++
.../polygene/api/entity/EntityReference.java | 15 +-
.../polygene/api/identity/StringIdentity.java | 4 +-
.../api/identity/UuidGeneratorMixin.java | 2 +-
.../api/indexing/IndexingException.java | 34 +
.../MissingIndexingSystemException.java | 34 +
.../api/object/NoSuchObjectException.java | 57 -
.../api/object/NoSuchObjectTypeException.java | 57 +
.../polygene/api/object/ObjectFactory.java | 4 +-
.../api/property/InitialValueProvider.java | 27 -
.../api/property/PropertyDescriptor.java | 2 -
.../query/MissingIndexingSystemException.java | 35 -
.../polygene/api/query/QueryBuilderFactory.java | 2 +
.../api/service/NoSuchServiceException.java | 54 -
.../api/service/NoSuchServiceTypeException.java | 48 +
.../polygene/api/service/ServiceFinder.java | 8 +-
.../importer/ServiceInstanceImporter.java | 7 +-
.../api/structure/ApplicationDescriptor.java | 10 +
.../polygene/api/structure/LayerDescriptor.java | 3 +-
.../unitofwork/NoSuchEntityTypeException.java | 22 +-
.../polygene/api/unitofwork/UnitOfWork.java | 2 -
.../api/value/NoSuchValueException.java | 43 -
.../api/value/NoSuchValueTypeException.java | 45 +
.../polygene/api/value/ValueBuilderFactory.java | 14 +-
.../org/apache/polygene/api/OperatorsTest.java | 18 +-
.../activation/PassivationExceptionTest.java | 61 +-
.../api/composite/PropertyMapperTest.java | 4 +-
.../api/docsupport/ApplicationDocs.java | 33 +-
.../polygene/api/type/ValueTypeFactoryTest.java | 2 +-
.../polygene/api/unitofwork/RemovalTest.java | 6 +-
.../api/unitofwork/ToEntityConversionTest.java | 2 +-
.../api/unitofwork/ToValueConversionTest.java | 12 +-
.../api/value/DocumentationSupport.java | 19 +-
core/bootstrap/src/docs/bootstrap.txt | 2 +-
.../bootstrap/ApplicationAssembler.java | 1 +
.../bootstrap/ApplicationAssemblerAdapter.java | 1 -
.../polygene/bootstrap/ApplicationName.java | 1 -
.../apache/polygene/bootstrap/Assembler.java | 1 +
.../apache/polygene/bootstrap/Assemblers.java | 56 +-
.../bootstrap/AssemblyReportException.java | 5 +-
.../apache/polygene/bootstrap/LayerName.java | 1 -
.../polygene/bootstrap/MetaInfoDeclaration.java | 8 -
.../polygene/bootstrap/MixinDeclaration.java | 4 -
.../polygene/bootstrap/ModuleAssembly.java | 30 +-
.../apache/polygene/bootstrap/ModuleName.java | 1 -
.../polygene/bootstrap/SingletonAssembler.java | 8 +-
.../bootstrap/builder/ApplicationBuilder.java | 56 +-
.../bootstrap/builder/LayerDeclaration.java | 2 -
.../bootstrap/builder/ModuleDeclaration.java | 3 -
.../DefaultIdentityGeneratorAssembler.java | 39 +
.../DefaultMetricsProviderAssembler.java | 37 +
.../defaults/DefaultSerializationAssembler.java | 52 +
.../defaults/DefaultUnitOfWorkAssembler.java | 58 +
.../polygene/bootstrap/defaults/package.html | 24 +
.../DefaultIdentityGeneratorAssembler.java | 38 -
.../layered/LayeredApplicationAssembler.java | 26 +-
.../layered/LayeredLayerAssembler.java | 22 +-
.../DefaultSerializationAssembler.java | 50 -
.../unitofwork/DefaultUnitOfWorkAssembler.java | 55 -
.../polygene/bootstrap/ClassScannerTest.java | 13 +-
.../bootstrap/DocumentationSupport.java | 419 ++++---
core/runtime/src/docs/runtime.txt | 2 +-
.../polygene/runtime/PolygeneRuntimeImpl.java | 13 +
.../association/AbstractAssociationModel.java | 10 +-
.../association/AssociationInstance.java | 6 +-
.../runtime/association/AssociationsModel.java | 16 +-
.../association/ManyAssociationsModel.java | 16 +-
.../association/NamedAssociationInstance.java | 9 +-
.../association/NamedAssociationsModel.java | 21 +-
.../ApplicationAssemblyFactoryImpl.java | 3 -
.../bootstrap/ApplicationModelFactoryImpl.java | 125 ++-
.../runtime/bootstrap/AssemblyHelper.java | 5 +-
.../bootstrap/CompositeAssemblyImpl.java | 125 +--
.../bootstrap/ImportedServiceAssemblyImpl.java | 6 +-
.../runtime/bootstrap/ModuleAssemblyImpl.java | 92 +-
.../bootstrap/ServiceDeclarationImpl.java | 2 +-
.../composite/AbstractModifierModel.java | 1 -
.../runtime/composite/CompositeMethodModel.java | 2 +-
.../runtime/composite/CompositeModel.java | 47 +-
.../runtime/composite/ConstraintsInstance.java | 24 +-
.../runtime/composite/ConstructorModel.java | 5 +-
.../composite/FragmentInvocationHandler.java | 15 +-
.../GenericFragmentInvocationHandler.java | 2 -
.../composite/InterfaceDefaultMethodsMixin.java | 5 +-
.../polygene/runtime/composite/StateModel.java | 6 +
.../runtime/composite/TransientModel.java | 15 +-
.../TypedModifierInvocationHandler.java | 17 +-
.../runtime/composite/UsesInstance.java | 1 +
.../composite/ValueConstraintsInstance.java | 33 +-
.../composite/ValueConstraintsModel.java | 14 +-
.../polygene/runtime/entity/EntityInstance.java | 13 +-
.../polygene/runtime/entity/EntityModel.java | 6 +
.../runtime/entity/EntityStateModel.java | 21 +-
.../ServiceInjectionProviderFactory.java | 4 +-
.../provider/UsesInjectionProviderFactory.java | 8 +-
.../runtime/property/PropertiesModel.java | 18 +-
.../runtime/property/PropertyModel.java | 33 +-
.../runtime/query/QueryBuilderFactoryImpl.java | 4 +-
.../polygene/runtime/service/ServiceModel.java | 29 +-
.../polygene/runtime/structure/LayerModel.java | 7 +-
.../runtime/structure/ModuleInstance.java | 75 +-
.../polygene/runtime/structure/ModuleModel.java | 4 +
.../runtime/structure/UsedLayersModel.java | 6 +
.../runtime/unitofwork/ModuleUnitOfWork.java | 22 +-
.../runtime/unitofwork/UnitOfWorkInstance.java | 2 +-
.../runtime/value/ValueBuilderInstance.java | 4 +-
.../polygene/runtime/value/ValueInstance.java | 23 +-
.../polygene/runtime/value/ValueModel.java | 100 +-
.../polygene/runtime/value/ValueStateModel.java | 18 +
.../apache/polygene/api/common/RemovalTest.java | 6 +-
.../bootstrap/ApplicationAssemblerTest.java | 40 +-
.../polygene/bootstrap/ErrorReportingTest.java | 2 -
.../polygene/bootstrap/RuntimeMixinsTest.java | 69 +-
.../constraints/PropertyConstraintTest.java | 4 +-
...ceCollisionWithUnrelatedReturnTypesTest.java | 1 +
.../qi377/SetAssociationInSideEffectTest.java | 8 +-
...alueCollisionWithRelatedReturnTypesTest.java | 10 +-
.../polygene/regression/qi382/Qi382Test.java | 11 +-
.../polygene/regression/qi383/Qi383Test.java | 11 +-
.../polygene/regression/qi78/IssueTest.java | 23 +-
.../activation/ApplicationActivationTest.java | 19 +-
.../ImportedServiceActivationTest.java | 70 +-
.../runtime/activation/LayerActivationTest.java | 19 +-
.../activation/ModuleActivationTest.java | 19 +-
.../activation/ServiceActivationTest.java | 32 +-
.../AppliesToOrConditionQI241Test.java | 6 +-
.../association/AssociationAssignmentTest.java | 5 +-
.../bootstrap/docs/DocumentationSupport.java | 25 +-
.../composite/CompositeFactoryImplTest.java | 5 +-
.../composite/InterfaceDefaultMethodsTest.java | 7 +-
.../runtime/composite/UseCompositeTest.java | 84 ++
.../runtime/concerns/GenericConcernTest.java | 8 +-
.../runtime/constraints/ConstraintsTest.java | 6 +-
.../runtime/defaults/UseDefaultsTest.java | 2 +
.../entity/EntityBuilderWithStateTest.java | 2 -
.../polygene/runtime/entity/EntityTypeTest.java | 12 +-
.../runtime/entity/EntityVisibilityTest.java | 19 +-
.../entity/associations/AssociationTest.java | 10 +
.../ConstructorInjectionOfThisTest.java | 51 +-
.../injection/InvocationInjectionTest.java | 17 +-
.../runtime/injection/ServiceInjectionTest.java | 62 +-
.../injection/UnitOfWorkInjectionTest.java | 6 +-
.../ConfigurationInstantiationTest.java | 119 ++
.../runtime/mixin/AssemblyMixinTest.java | 10 +-
.../runtime/mixin/AssemblyRoleTest.java | 8 +-
.../polygene/runtime/mixin/JDKMixinTest.java | 4 +-
.../objects/ObjectBuilderFactoryTest.java | 68 +-
.../runtime/objects/ObjectConcernTest.java | 14 +-
.../runtime/objects/ObjectVisibilityTest.java | 84 +-
.../property/ValueNestedBuilderTest.java | 2 +
.../runtime/query/IterableQuerySourceTest.java | 16 +-
.../apache/polygene/runtime/query/Network.java | 4 +-
.../runtime/query/NonQueryableTest.java | 7 +-
.../runtime/service/AvailableServiceTest.java | 10 +-
.../service/ConfigurationConstraintTest.java | 124 +++
.../runtime/service/ServiceVisibilityTest.java | 82 +-
.../runtime/structure/MixinVisibilityTest.java | 217 ++--
.../polygene/runtime/structure/ModuleTest.java | 54 +-
.../NoSuchEntityTypeExceptionTest.java | 95 ++
.../PrivateCompositeVisibilityTest.java | 10 +-
.../runtime/structure/StructureTest.java | 39 +-
.../structure/TypeToCompositeLookupTest.java | 9 -
.../transients/TransientBuilderFactoryTest.java | 4 +-
.../transients/TransientVisibilityTest.java | 73 +-
.../unitofwork/PrivateEntityUnitOfWorkTest.java | 15 +-
.../runtime/unitofwork/RemovalTest.java | 8 +-
.../runtime/value/AssociationToValueTest.java | 9 +-
.../runtime/value/NestedValueBuilderTest.java | 10 +-
.../runtime/value/ValueComposite2Test.java | 8 +-
.../runtime/value/ValueCompositeBasicsTest.java | 2 +
.../value/ValueSerializationRegressionTest.java | 2 +-
.../runtime/value/ValueVisibilityTest.java | 72 +-
.../runtime/value/ValueWithAssociationTest.java | 11 +-
.../visibility/VisibilityInUnitOfWorkTest.java | 12 +-
.../importer/ServiceInstanceImporterTest.java | 10 +-
.../test/composite/CleanStackTraceTest.java | 15 +-
.../memory/MemoryEntityStoreTest.java | 2 +
.../service/HelloWorldService.properties | 2 +-
.../runtime/service/TestService1.properties | 20 +
.../runtime/service/TestService2.properties | 20 +
.../helpers/DefaultManyAssociationState.java | 5 -
.../helpers/DefaultNamedAssociationState.java | 6 +-
.../helpers/JSONMapEntityStoreMixin.java | 4 +-
.../helpers/MapEntityStoreMixin.java | 4 +-
.../spi/serialization/BuiltInConverters.java | 2 +-
.../spi/entitystore/Polygene142Test.java | 4 +-
.../helpers/JSONManyAssociationStateTest.java | 1 +
.../helpers/JsonNamedAssociationStateTest.java | 1 +
.../polygene/test/AbstractPolygeneTest.java | 4 -
.../polygene/test/EntityTestAssembler.java | 22 +-
.../test/cache/AbstractCachePoolTest.java | 11 +-
.../cache/AbstractEntityStoreWithCacheTest.java | 9 +-
...bstractConfigurationDeserializationTest.java | 6 +-
.../test/entity/AbstractEntityStoreTest.java | 91 +-
...stractPolygeneMultiLayeredTestWithModel.java | 161 +++
.../test/entity/model/EntityStoreTestSuite.java | 543 +++++++++
.../test/entity/model/legal/LegalService.java | 142 +++
.../polygene/test/entity/model/legal/Will.java | 40 +
.../test/entity/model/legal/WillAmount.java | 29 +
.../test/entity/model/legal/WillBenefit.java | 37 +
.../test/entity/model/legal/WillItem.java | 30 +
.../test/entity/model/legal/WillPercentage.java | 27 +
.../entity/model/monetary/CheckBookSlip.java | 58 +
.../test/entity/model/monetary/Currency.java | 60 +
.../test/entity/model/people/Address.java | 37 +
.../polygene/test/entity/model/people/City.java | 28 +
.../test/entity/model/people/Country.java | 28 +
.../entity/model/people/PeopleRepository.java | 183 ++++
.../test/entity/model/people/Person.java | 89 ++
.../test/entity/model/people/PhoneNumber.java | 55 +
.../polygene/test/entity/model/people/Rent.java | 53 +
.../test/indexing/AbstractAnyQueryTest.java | 2 -
.../test/indexing/AbstractQueryTest.java | 6 +-
.../apache/polygene/test/indexing/TestData.java | 8 +-
.../AbstractMultiLayeredIndexingTest.java | 3 +-
.../metrics/AbstractPolygeneMetricsTest.java | 10 +-
.../test/metrics/AbstractTimingCaptureTest.java | 2 -
.../test/model/assembly/AccessLayer.java | 10 +-
.../test/model/assembly/AccountModule.java | 2 -
.../model/assembly/ApplicationAssembler.java | 1 -
.../test/model/assembly/ConfigLayer.java | 3 -
.../test/model/assembly/ConfigModule.java | 3 -
.../test/model/assembly/DomainLayer.java | 3 -
.../test/model/assembly/FamilyModule.java | 3 -
.../test/model/assembly/IndexingLayer.java | 3 -
.../test/model/assembly/PersistenceLayer.java | 3 -
.../test/model/assembly/PersistenceModule.java | 3 -
.../test/model/assembly/PetShopModule.java | 3 -
.../model/assembly/TestExecutionModule.java | 2 -
.../test/model/assembly/TestSuite1Module.java | 2 -
.../test/model/assembly/TestSuite2Module.java | 2 -
.../test/model/assembly/TestSuite3Module.java | 2 -
.../AbstractCollectionSerializationTest.java | 2 -
...AbstractValueCompositeSerializationTest.java | 8 +-
.../polygene/test/util/FreePortFinder.java | 2 +-
.../polygene/test/cache/MemoryCacheTest.java | 3 +-
dependencies.gradle | 76 +-
distributions/src/src-dist/README.txt | 16 +-
.../gradle/wrapper-install/build.gradle | 25 +
.../gradle/wrapper-install/settings.gradle | 19 +
.../ehcache/assembly/EhCacheAssembler.java | 3 +-
.../cache/memcache/MemcachePoolMixin.java | 69 +-
.../memcache/assembly/MemcacheAssembler.java | 5 +-
.../cache/memcache/MemcacheCachePoolTest.java | 2 +-
extensions/entitystore-cassandra/build.gradle | 1 +
.../CassandraEntityStoreConfiguration.java | 2 +
.../cassandra/CassandraEntityStoreMixin.java | 11 +-
.../entitystore/cassandra/ClusterBuilder.java | 18 +-
.../assembly/CassandraEntityStoreAssembler.java | 3 +-
.../cassandra/CassandraEntityStoreTest.java | 85 ++
.../CassandraEntityStoreTestSuite.java | 80 ++
.../cassandra/CassandraMapEntityStoreTest.java | 83 --
.../cassandra/EmptyCassandraTableMixin.java | 2 -
.../file/assembly/FileEntityStoreAssembler.java | 3 +-
.../entitystore/file/FileEntityStoreTest.java | 2 +-
.../file/FileEntityStoreTestSuite.java | 50 +
.../file/FileEntityStoreWithCacheTest.java | 2 +-
.../entitystore/geode/GeodeConfiguration.java | 81 --
.../geode/GeodeEntityStoreConfiguration.java | 81 ++
.../geode/GeodeEntityStoreMixin.java | 10 +-
.../assembly/GeodeEntityStoreAssembler.java | 7 +-
.../entitystore/geode/GeodeEntityStoreTest.java | 2 +-
.../geode/GeodeEntityStoreTestSuite.java | 38 +
.../geode/GeodeEntityStoreWithCacheTest.java | 2 +-
.../hazelcast/HazelcastConfiguration.java | 39 -
.../HazelcastEntityStoreConfiguration.java | 50 +
.../hazelcast/HazelcastEntityStoreMixin.java | 8 +-
.../assembly/HazelcastEntityStoreAssembler.java | 7 +-
.../hazelcast/HazelcastEntityStoreTest.java | 2 +-
.../HazelcastEntityStoreTestSuite.java | 48 +
.../HazelcastEntityStoreWithCacheTest.java | 2 +-
.../JCloudsEntityStoreConfiguration.java | 54 +
.../jclouds/JCloudsEntityStoreMixin.java | 284 +++++
.../jclouds/JCloudsEntityStoreService.java | 48 +
.../JCloudsMapEntityStoreConfiguration.java | 54 -
.../jclouds/JCloudsMapEntityStoreMixin.java | 284 -----
.../jclouds/JCloudsMapEntityStoreService.java | 48 -
.../assembly/JCloudsEntityStoreAssembler.java | 11 +-
.../jclouds/JCloudsFilesystemTest.java | 6 +-
.../jclouds/JCloudsFilesystemTestSuite.java | 52 +
.../entitystore/jclouds/JCloudsS3Test.java | 9 +-
.../entitystore/jclouds/JCloudsS3TestSuite.java | 53 +
.../jclouds/JCloudsTransientTest.java | 2 +-
.../jclouds/JCloudsTransientTestSuite.java | 39 +
.../jclouds/JCloudsWithCacheTest.java | 2 +-
.../entitystore/jdbm/JdbmConfiguration.java | 52 -
.../jdbm/JdbmEntityStoreConfiguration.java | 52 +
.../entitystore/jdbm/JdbmEntityStoreMixin.java | 4 +-
.../jdbm/JdbmEntityStoreService.java | 8 +-
.../jdbm/assembly/JdbmEntityStoreAssembler.java | 7 +-
.../entitystore/jdbm/JdbmEntityStoreTest.java | 2 +-
.../jdbm/JdbmEntityStoreTestSuite.java | 47 +
.../jdbm/JdbmEntityStoreWithCacheTest.java | 2 +-
.../LevelDBEntityStoreConfiguration.java | 3 +
.../leveldb/LevelDBEntityStoreMixin.java | 15 +-
.../assembly/LevelDBEntityStoreAssembler.java | 3 +-
.../leveldb/JavaLevelDBEntityStoreTest.java | 2 +-
.../JavaLevelDBEntityStoreTestSuite.java | 52 +
.../leveldb/JniLevelDBEntityStoreTest.java | 21 +-
.../LevelDBEntityStoreWithCacheTest.java | 2 +-
.../assembly/MemoryEntityStoreAssembler.java | 3 +-
.../memory/MemoryEntityStoreTest.java | 1 +
.../memory/MemoryEntityStoreTestSuite.java | 37 +
.../memory/MemoryEntityStoreWithCacheTest.java | 1 +
extensions/entitystore-mongodb/build.gradle | 2 +-
.../entitystore/mongodb/MongoAccessors.java | 32 -
.../entitystore/mongodb/MongoDBAccessors.java | 32 +
.../MongoDBEntityStoreConfiguration.java | 92 ++
.../mongodb/MongoDBEntityStoreMixin.java | 322 ++++++
.../mongodb/MongoDBEntityStoreService.java | 49 +
.../mongodb/MongoEntityStoreConfiguration.java | 92 --
.../mongodb/MongoMapEntityStoreMixin.java | 322 ------
.../mongodb/MongoMapEntityStoreService.java | 49 -
.../assembly/MongoDBEntityStoreAssembler.java | 11 +-
.../mongodb/EmbedMongoDBMapEntityStoreTest.java | 88 ++
.../EmbedMongoDBMapEntityStoreTestSuite.java | 84 ++
.../mongodb/EmbedMongoMapEntityStoreTest.java | 88 --
.../mongodb/MongoDBEntityStoreTest.java | 85 ++
.../mongodb/MongoDBEntityStoreTestSuite.java | 77 ++
.../MongoDBEntityStoreWithCacheTest.java | 81 ++
.../mongodb/MongoMapEntityStoreTest.java | 88 --
.../MongoMapEntityStoreWithCacheTest.java | 84 --
.../PreferencesEntityStoreMixin.java | 46 +-
.../PreferencesEntityStoreAssembler.java | 12 +-
.../preferences/PreferencesEntityStoreTest.java | 4 +-
.../PreferencesEntityStoreTestSuite.java | 56 +
.../redis/RedisEntityStoreConfiguration.java | 2 +-
.../redis/RedisEntityStoreMixin.java | 177 +++
.../redis/RedisEntityStoreService.java | 49 +
.../redis/RedisMapEntityStoreMixin.java | 177 ---
.../redis/RedisMapEntityStoreService.java | 49 -
.../assembly/RedisEntityStoreAssembler.java | 7 +-
.../entitystore/redis/RedisEntityStoreTest.java | 80 ++
.../redis/RedisEntityStoreTestSuite.java | 74 ++
.../redis/RedisEntityStoreWithCacheTest.java | 74 ++
.../redis/RedisMapEntityStoreTest.java | 80 --
.../redis/RedisMapEntityStoreWithCacheTest.java | 74 --
.../entitystore/riak/RiakEntityStoreMixin.java | 384 +++++++
.../riak/RiakEntityStoreService.java | 53 +
.../riak/RiakMapEntityStoreMixin.java | 384 -------
.../riak/RiakMapEntityStoreService.java | 53 -
.../riak/assembly/RiakEntityStoreAssembler.java | 12 +-
.../entitystore/riak/RiakEntityStoreTest.java | 71 ++
.../riak/RiakEntityStoreTestSuite.java | 70 ++
.../riak/RiakEntityStoreWithCacheTest.java | 69 ++
.../riak/RiakMapEntityStoreTest.java | 71 --
.../riak/RiakMapEntityStoreWithCacheTest.java | 69 --
.../sql/SQLEntityStoreConfiguration.java | 47 +
.../entitystore/sql/SQLEntityStoreMixin.java | 244 +++++
.../entitystore/sql/SQLEntityStoreService.java | 43 +
.../sql/SQLMapEntityStoreConfiguration.java | 47 -
.../entitystore/sql/SQLMapEntityStoreMixin.java | 244 -----
.../sql/SQLMapEntityStoreService.java | 43 -
.../AbstractSQLEntityStoreAssembler.java | 98 ++
.../AbstractSQLMapEntityStoreAssembler.java | 97 --
.../assembly/DerbySQLEntityStoreAssembler.java | 2 +-
.../sql/assembly/H2SQLEntityStoreAssembler.java | 2 +-
.../sql/assembly/MySQLEntityStoreAssembler.java | 2 +-
.../PostgreSQLEntityStoreAssembler.java | 2 +-
.../assembly/SQLiteEntityStoreAssembler.java | 2 +-
.../sql/DerbySQLEntityStoreTest.java | 6 +-
.../sql/DerbySQLEntityStoreTestSuite.java | 94 ++
.../entitystore/sql/H2SQLEntityStoreTest.java | 2 +-
.../sql/H2SQLEntityStoreTestSuite.java | 56 +
.../entitystore/sql/MySQLEntityStoreTest.java | 8 +-
.../sql/MySQLEntityStoreTestSuite.java | 122 +++
.../sql/PostgreSQLEntityStoreTest.java | 38 +-
.../sql/PostgreSQLEntityStoreTestSuite.java | 111 ++
.../entitystore/sql/SQLiteEntityStoreTest.java | 2 +-
.../sql/SQLiteEntityStoreTestSuite.java | 65 ++
.../ElasticSearchClusterConfiguration.java | 2 +-
.../ElasticSearchConfiguration.java | 50 -
.../elasticsearch/ElasticSearchFinder.java | 6 +-
.../ElasticSearchIndexException.java | 36 -
.../ElasticSearchIndexExporter.java | 5 +-
.../elasticsearch/ElasticSearchIndexer.java | 5 +-
.../ElasticSearchIndexingConfiguration.java | 49 +
.../ElasticSearchIndexingException.java | 36 +
.../elasticsearch/ElasticSearchSupport.java | 5 +-
.../assembly/ESClientIndexQueryAssembler.java | 8 +-
.../assembly/ESClusterIndexQueryAssembler.java | 3 +-
.../ESFilesystemIndexQueryAssembler.java | 7 +-
.../elasticsearch/client/ESClientSupport.java | 6 +-
.../filesystem/ESFilesystemSupport.java | 6 +-
.../internal/AbstractElasticSearchSupport.java | 6 +-
.../index/elasticsearch/ESEmbeddedRule.java | 9 +-
.../ElasticSearchComplexQueryTest.java | 2 +-
.../elasticsearch/ElasticSearchFinderTest.java | 2 +-
.../ElasticSearchQueryMultimoduleTest.java | 4 +-
.../elasticsearch/ElasticSearchQueryTest.java | 2 +-
.../index/elasticsearch/ElasticSearchTest.java | 2 +-
.../index/elasticsearch/ImmenseTermTest.java | 2 +-
.../index/rdf/RdfIndexingEngineService.java | 30 -
.../polygene/index/rdf/RdfIndexingService.java | 30 +
.../index/rdf/UnsupportedLanguageException.java | 4 +-
.../rdf/assembly/RdfMemoryStoreAssembler.java | 7 +-
.../assembly/RdfNativeSesameStoreAssembler.java | 7 +-
.../assembly/RdfRdbmsSesameStoreAssembler.java | 7 +-
.../index/rdf/indexing/RdfExporter.java | 106 --
.../index/rdf/indexing/RdfIndexExporter.java | 93 ++
.../index/rdf/indexing/RdfIndexerService.java | 239 ++++
.../index/rdf/indexing/RdfIndexingService.java | 240 ----
.../index/rdf/query/TupleQueryExecutor.java | 12 +-
.../polygene/index/rdf/RDFPerformanceTest.java | 4 +-
.../polygene/index/rdf/RdfComplexQueryTest.java | 2 +-
.../polygene/index/rdf/RdfEntityFinderTest.java | 2 +-
.../index/rdf/RdfNamedQueryMultimoduleTest.java | 3 -
.../index/rdf/RdfQueryMultimoduleTest.java | 4 -
.../apache/polygene/index/rdf/RdfQueryTest.java | 2 -
.../polygene/index/rdf/qi95/Qi95IssueTest.java | 187 +---
.../index/solr/EmbeddedSolrService.java | 5 +-
.../polygene/index/solr/SolrQueryService.java | 3 +-
.../solr/assembly/SolrIndexingAssembler.java | 1 +
extensions/indexing-sql/dev-status.xml | 6 +-
.../index/sql/SQLIndexingConfiguration.java | 31 +
.../sql/SQLIndexingEngineConfiguration.java | 31 -
.../index/sql/SQLIndexingEngineService.java | 44 -
.../polygene/index/sql/SQLIndexingService.java | 44 +
.../AbstractSQLIndexQueryAssembler.java | 11 +-
.../assembly/PostgreSQLIndexQueryAssembler.java | 4 +-
.../support/postgresql/PostgreSQLService.java | 4 +-
.../support/skeletons/AbstractSQLIndexing.java | 281 ++---
.../support/skeletons/AbstractSQLStartup.java | 9 +-
.../skeletons/SQLCompatEntityStateWrapper.java | 25 +-
.../support/skeletons/SqlIndexingException.java | 34 +
.../postgresql/PostgreSQLComplexQueryTest.java | 2 +-
.../postgresql/PostgreSQLDBIntegrityTest.java | 2 +-
.../postgresql/PostgreSQLEntityFinderTest.java | 2 +-
.../sql/postgresql/PostgreSQLQueryTest.java | 2 +-
.../codahale/CodahaleMetricsProvider.java | 3 +-
.../assembly/CodahaleMetricsAssembler.java | 3 +-
.../polygene/migration/MigrationTest.java | 58 +-
.../polygene/index/reindexer/ReindexerTest.java | 8 +-
.../JavaxJsonSerializationAssembler.java | 1 +
...vaxJsonConfigurationDeserializationTest.java | 8 +
.../JavaxXmlSerializationAssembler.java | 1 +
.../MessagePackSerializationAssembler.java | 1 +
gradle.properties | 2 +
gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54712 bytes
gradle/wrapper/gradle-wrapper.properties | 3 +-
gradlew | 6 +-
internals/testsupport-internal/build.gradle | 7 +-
.../src/main/docker/mongo/Dockerfile | 16 +
.../polygene/test/docker/DelayChecker.java | 60 +
.../apache/polygene/test/docker/DockerRule.java | 156 +++
.../apache/polygene/test/docker/package.html | 25 +
.../polygene/test/internal/DelayChecker.java | 60 -
.../polygene/test/internal/DockerRule.java | 156 ---
.../apache/polygene/test/internal/package.html | 25 -
.../polygene/library/alarm/AlarmSystem.java | 2 +-
.../library/alarm/AlarmSystemAssembler.java | 3 +-
.../polygene/library/alarm/AlarmProxyTest.java | 6 +-
libraries/constraints/build.gradle | 2 +
.../library/constraints/HostPortConstraint.java | 43 +
.../constraints/HostPortListConstraint.java | 58 +
.../constraints/annotation/HostPort.java | 37 +
.../constraints/annotation/HostPortList.java | 37 +
.../library/constraints/ConstraintTest.java | 3 +-
.../constraints/HostPortConstraintTest.java | 119 ++
.../constraints/HostPortListConstraintTest.java | 159 +++
.../fileconfig/FileConfigurationAssembler.java | 3 +-
.../fileconfig/FileConfigurationTest.java | 42 +-
libraries/http/build.gradle | 2 +-
.../library/http/JettyServiceAssembler.java | 5 +-
.../library/http/SecureJettyConfiguration.java | 2 +-
.../http/VirtualHostJettyServiceTest.java | 2 -
libraries/jmx/src/docs/jmx.txt | 2 +-
.../jmx/ConfigurationManagerService.java | 2 +-
.../polygene/library/jmx/JMXAssembler.java | 2 -
.../apache/polygene/library/jmx/JMXTest.java | 15 +-
.../log/assemblies/LoggingAssembler.java | 2 -
.../trace/assemblies/TracingAssembler.java | 2 -
.../polygene/library/rdf/Model2XMLTest.java | 54 +-
.../rdf/entity/EntitySerializerTest.java | 4 +-
.../rdf/entity/EntityTypeSerializerTest.java | 19 +-
.../library/rest/client/ClientAssembler.java | 3 +-
.../ContextResourceClientFactoryTest.java | 2 +
.../rest/client/ContinuousIntegrationTest.java | 2 +
.../library/rest/client/RssReaderTest.java | 54 +-
.../library/rest/common/ValueAssembler.java | 2 -
.../rest/server/api/ContextResource.java | 4 +-
.../server/assembler/RestServerAssembler.java | 3 +-
.../restlet/ConstraintViolationMessages.java | 4 +-
.../restlet/InteractionConstraintsService.java | 6 +-
.../server/restlet/RequestReaderDelegator.java | 2 +-
.../server/restlet/ResponseWriterDelegator.java | 2 +-
.../requestreader/DefaultRequestReader.java | 4 +-
.../library/rest/admin/EntitiesResource.java | 1 -
.../library/rest/admin/EntityResource.java | 3 +-
.../library/rest/admin/IndexResource.java | 10 +-
.../library/rest/admin/RestAssembler.java | 3 +-
.../library/rest/admin/DomainAssembler.java | 4 +-
.../library/rest/admin/DummyDataService.java | 8 +-
.../polygene/library/rest/admin/RestTest.java | 12 +-
libraries/restlet/build.gradle | 5 +-
.../library/restlet/PolygeneEntityRestlet.java | 1 -
.../restlet/PolygeneRestApplication.java | 116 +-
.../PolygeneRestApplicationLauncher.java | 104 ++
.../library/restlet/PolygeneServerServlet.java | 9 +-
.../restlet/assembly/CrudServiceAssembler.java | 2 -
.../restlet/assembly/GenericRestLayer.java | 36 -
.../assembly/RestApplicationAssembler.java | 86 --
.../RestletCrudConnectivityAssembler.java | 5 +-
.../assembly/RestletCrudModuleAssembler.java | 26 +-
.../configuration/ConfigurationLayer.java | 47 -
.../configuration/ConfigurationModule.java | 41 -
.../connectivity/ConnectivityLayer.java | 41 -
.../assembly/connectivity/RestModule.java | 42 -
.../assembly/connectivity/SecurityModule.java | 37 -
.../restlet/assembly/domain/CrudModule.java | 40 -
.../restlet/assembly/domain/DomainLayer.java | 39 -
.../infrastructue/FileStorageModule.java | 52 -
.../assembly/infrastructue/IndexingModule.java | 56 -
.../infrastructue/InfrastructureLayer.java | 56 -
.../infrastructue/SerializationModule.java | 39 -
.../assembly/resource/ResourceLayer.java | 39 -
.../restlet/crud/EntityListResource.java | 5 +-
.../library/restlet/crud/EntityResource.java | 15 +-
.../restlet/identity/IdentityManager.java | 4 +-
.../restlet/resource/CreationResource.java | 8 +-
.../restlet/resource/EntryPointResource.java | 6 +-
.../restlet/resource/ResourceBuilder.java | 32 +-
.../serialization/JsonRepresentation.java | 7 +-
.../library/restlet/TestApplication.java | 10 +-
.../assembly/RestApplicationAssembler.java | 85 ++
.../configuration/ConfigurationLayer.java | 45 +
.../configuration/ConfigurationModule.java | 39 +
.../connectivity/ConnectivityLayer.java | 39 +
.../assembly/connectivity/RestModule.java | 40 +
.../assembly/connectivity/SecurityModule.java | 35 +
.../restlet/assembly/domain/CrudModule.java | 38 +
.../restlet/assembly/domain/DomainLayer.java | 37 +
.../infrastructue/FileStorageModule.java | 50 +
.../assembly/infrastructue/IndexingModule.java | 54 +
.../infrastructue/InfrastructureLayer.java | 54 +
.../infrastructue/SerializationModule.java | 37 +
.../assembly/resource/ResourceLayer.java | 37 +
.../polygene/library/scripting/Scripting.java | 2 +-
.../library/scripting/HelloSpeakerTest.java | 31 +-
.../shiro/assembly/PasswordDomainAssembler.java | 3 +-
.../assembly/PermissionsDomainAssembler.java | 3 +-
.../assembly/StandaloneShiroAssembler.java | 3 +-
.../library/shiro/web/ShiroFilterService.java | 5 +-
.../shiro/web/assembly/HttpShiroAssembler.java | 26 +-
.../PolygeneApplicationFactoryBean.java | 8 +-
.../importer/SpringImporterAssembler.java | 3 +-
.../sql/liquibase/LiquibaseAssembler.java | 3 +-
...bstractPooledDataSourceServiceAssembler.java | 3 +-
.../sql/assembly/DataSourceAssembler.java | 5 +-
.../sql/assembly/DataSourceJMXAssembler.java | 3 +-
.../assembly/ExternalDataSourceAssembler.java | 5 +-
.../DataSourceConfigurationState.java | 3 +-
.../DataSourceConfigurationManagerService.java | 2 +-
...taSourceConfigurationManagerServiceTest.java | 3 -
.../assembly/PersistingSequencingAssembler.java | 3 +-
.../assembly/TransientSequencingAssembler.java | 3 +-
.../uid/uuid/assembly/UuidServiceAssembler.java | 3 +-
.../uowfile/bootstrap/UoWFileAssembler.java | 3 +-
.../docs/tutorials/howto-releasing-apache.txt | 11 +-
manual/src/docs/userguide/extensions.txt | 4 +
manual/src/docs/userguide/glossary.txt | 8 +
manual/src/docs/userguide/tools.txt | 15 +-
.../src/docs/website/resources/css/polygene.css | 4 +
.../docs/website/resources/images/cloudbees.png | Bin 7493 -> 0 bytes
.../website/resources/images/library-jmx.png | Bin 36579 -> 244987 bytes
.../resources/images/tools-entity-viewer.png | Bin 52322 -> 0 bytes
.../images/tools-envisage-stacked-collapsed.png | Bin 30355 -> 211242 bytes
.../resources/images/tools-envisage-stacked.png | Bin 36070 -> 225560 bytes
.../images/tools-envisage-structure.png | Bin 90145 -> 277222 bytes
.../resources/images/tools-envisage-type.png | Bin 88278 -> 279752 bytes
.../ParameterViolationConcern.java | 4 +-
.../PhoneNumberParameterViolationConcern.java | 6 +-
.../moneytransfer/context/PayBillsContext.java | 4 +-
.../moneytransfer/context/PayBillsContext2.java | 4 +-
.../dci/moneytransfer/test/AccountIds.java | 8 +-
.../moneytransfer/test/TransferMoneyTest.java | 21 +-
.../moneytransfer/test/TransferMoneyTest2.java | 29 +-
.../sample/forum/assembler/ForumAssembler.java | 2 -
.../sample/forum/data/entity/Forums.java | 4 +-
.../sample/forum/data/entity/Users.java | 2 +-
.../rest/resource/forum/BoardResource.java | 2 +-
.../rest/resource/forum/ForumResource.java | 2 +-
.../rest/resource/forum/ForumsResource.java | 2 +-
.../apache/polygene/sample/forum/web/Main.java | 4 +-
.../sample/rental/domain/dev/InitialData.java | 2 +-
.../polygene/sample/rental/web/BookingPage.java | 4 +-
.../polygene/sample/rental/web/MainPage.java | 2 +-
.../apache/polygene/sample/rental/web/Page.java | 6 +-
.../sample/rental/web/assembly/PagesModule.java | 2 -
.../assembly/RentalApplicationAssembler.java | 2 -
.../rental/web/assembly/RentalModule.java | 2 -
.../rental/web/assembly/StorageModule.java | 2 -
.../sample/sqlsupport/AppAssembler.java | 2 -
.../swing/binding/SwingBindingAssembler.java | 2 +-
.../sample/swing/binding/example/Main.java | 20 +-
.../AbstractEntityStorePerformanceTest.java | 4 +-
.../jdbm/JdbmEntityStorePerformanceTest.java | 6 +-
.../MemoryEntityStorePerformanceTest.java | 13 +-
.../sql/DerbySQLEntityStorePerformanceTest.java | 51 +-
.../PostgreSQLEntityStorePerformanceTest.java | 57 +-
.../indexing/rdf/QueryPerformanceTest.java | 9 +-
.../CompositeCreationPerformanceTest.java | 14 +-
.../composite/InvocationPerformanceTest.java | 6 +-
.../PropertyMixinInvocationPerformanceTest.java | 4 +-
.../object/ObjectCreationPerformanceTest.java | 16 +-
.../ServiceInvocationPerformanceTest.java | 16 +-
.../test/regression/ConcernsOnPropertyTest.java | 6 +-
tools/envisage/src/docs/envisage.txt | 54 +
.../java/org/apache/polygene/envisage/Main.java | 7 +-
.../envisage/school/EnvisageSchoolSample.java | 12 +-
.../envisage/school/SchoolAssembler.java | 8 +-
.../initialdata/SamplePersonInitialData.java | 2 +-
.../persistence/PersistenceAssembler.java | 4 +-
tools/generator-polygene/.gitignore | 1 +
tools/generator-polygene/app/index.js | 276 +++--
.../application.java.tmpl | 83 ++
.../CommandLineApplication/bootstrap.tmpl | 49 +
.../ConfigModule/bootstrap.tmpl | 3 +
.../templates/ConfigurationLayer/bootstrap.tmpl | 2 +-
.../HttpServerModule/bootstrap.tmpl | 103 ++
.../HttpServerModule/module.js | 29 +
.../RestApiModule/DefaultEnroler.tmpl | 7 +-
.../RestApiModule/NullEnroler.tmpl | 32 -
.../RestApiModule/NullVerifier.tmpl | 34 -
.../RestApiModule/bootstrap.tmpl | 10 +-
.../ConnectivityLayer/RestApiModule/module.js | 4 -
.../templates/ConnectivityLayer/bootstrap.tmpl | 3 +-
.../DomainLayer/DomainModule/Configuration.tmpl | 10 +-
.../DomainLayer/DomainModule/Crud.tmpl | 7 +-
.../DomainLayer/DomainModule/Entity.tmpl | 7 +-
.../DomainLayer/DomainModule/bootstrap.tmpl | 23 +-
.../DomainModule/config.properties.tmpl | 22 +
.../DomainLayer/DomainModule/config.yaml.tmpl | 23 -
.../DomainLayer/DomainModule/module.js | 14 +-
.../DomainLayer/JmxModule/bootstrap.tmpl | 6 +-
.../DomainLayer/SecurityModule/bootstrap.tmpl | 20 -
.../IndexingModule/bootstrap.tmpl | 29 +-
.../indexing/ds-index-postgresql.properties | 23 +
.../indexing/index-rdf.properties | 57 +
.../IndexingModule/indexing/solr-schema.xml | 606 ++++++++++
.../IndexingModule/indexing/solrconfig.xml | 1036 ++++++++++++++++++
.../IndexingModule/module.js | 19 +
.../MetricsModule/bootstrap.tmpl | 31 +-
.../InfrastructureLayer/MetricsModule/module.js | 8 +-
.../SerializationModule/bootstrap.tmpl | 10 +-
.../SerializationModule/module.js | 2 +-
.../StorageModule/bootstrap.tmpl | 54 +-
.../InfrastructureLayer/StorageModule/module.js | 20 +
.../storage/ds-es-derbysql.properties | 24 +
.../storage/ds-es-h2sql.properties | 24 +
.../storage/ds-es-mysql.properties | 24 +
.../storage/ds-es-postgresql.properties | 24 +
.../storage/ds-es-sqlite.properties | 24 +
.../storage/es-cassandra.properties | 57 +
.../StorageModule/storage/es-file.properties | 49 +
.../StorageModule/storage/es-geode.properties | 53 +
.../storage/es-hazelcast.properties | 29 +
.../StorageModule/storage/es-jclouds.properties | 48 +
.../StorageModule/storage/es-jdbm.properties | 31 +
.../StorageModule/storage/es-leveldb.properties | 52 +
.../StorageModule/storage/es-mongodb.properties | 71 ++
.../StorageModule/storage/es-redis.properties | 44 +
.../StorageModule/storage/es-riak.properties | 107 ++
.../StorageModule/storage/es-sql.properties | 36 +
.../InfrastructureLayer/bootstrap.tmpl | 14 +-
.../RestAPIApplication/Launcher.java.tmpl | 76 ++
.../app/templates/RestAPIApplication/SETUP.tmpl | 41 +
.../app/templates/RestAPIApplication/app.js | 34 +-
.../RestAPIApplication/application.java.tmpl | 97 ++
.../RestAPIApplication/bootstrap-test.tmpl | 406 +++++++
.../templates/RestAPIApplication/bootstrap.tmpl | 72 ++
.../customUnixStartScript.txt.tmpl | 175 +++
.../customWindowsStartScript.txt.tmpl | 89 ++
.../RestAPIApplication/dev-keystore.p12 | Bin 0 -> 2586 bytes
.../RestAPIApplication/web-shiro.ini.tmpl | 44 +
.../templates/RestAPIApplication/web.xml.tmpl | 46 -
.../CommandLineModule/bootstrap.tmpl | 2 +-
.../app/templates/buildtool/build.js | 8 +-
.../app/templates/buildtool/gradle-app.tmpl | 103 +-
.../templates/buildtool/gradle-bootstrap.tmpl | 67 +-
.../app/templates/buildtool/gradle-model.tmpl | 8 +-
.../app/templates/buildtool/gradle-rest.tmpl | 6 +-
.../app/templates/buildtool/gradle-root.tmpl | 45 +-
.../app/templates/buildtool/gradle-wrapper.jar_ | Bin 51348 -> 0 bytes
.../buildtool/gradle-wrapper.properties_ | 24 -
.../app/templates/buildtool/gradlew-bat.tmpl | 109 --
.../app/templates/buildtool/gradlew.tmpl | 183 ----
tools/generator-polygene/build.gradle | 24 +-
tools/generator-polygene/dev-status.xml | 6 +-
tools/generator-polygene/package.json | 2 +-
.../src/docs/yeoman_polygene.txt | 452 ++++++++
tools/generator-polygene/test/generator_test.js | 130 ++-
tools/model-detail/dev-status.xml | 2 +-
tools/model-detail/src/docs/model-detail.txt | 52 +
.../descriptor/ActivatorDetailDescriptor.java | 29 +
.../descriptor/ApplicationDetailDescriptor.java | 26 +
.../descriptor/CompositeDetailDescriptor.java | 27 +-
.../CompositeMethodDetailDescriptor.java | 36 +-
.../descriptor/ConstructorDetailDescriptor.java | 8 +
.../descriptor/EntityDetailDescriptor.java | 10 +-
.../ImportedServiceCompositeDescriptor.java | 17 +
.../ImportedServiceDetailDescriptor.java | 14 +
.../InjectedFieldDetailDescriptor.java | 9 +
.../InjectedMethodDetailDescriptor.java | 8 +
.../InjectedParametersDetailDescriptor.java | 29 +-
.../model/descriptor/LayerDetailDescriptor.java | 29 +
.../MethodConcernDetailDescriptor.java | 28 +
.../MethodConcernsDetailDescriptor.java | 14 +
.../MethodConstraintDetailDescriptor.java | 9 +
.../MethodConstraintsDetailDescriptor.java | 6 +
.../MethodSideEffectDetailDescriptor.java | 27 +
.../MethodSideEffectsDetailDescriptor.java | 9 +
.../model/descriptor/MixinDetailDescriptor.java | 28 +
.../descriptor/ModuleDetailDescriptor.java | 21 +
.../descriptor/ObjectDetailDescriptor.java | 28 +
.../descriptor/ServiceDetailDescriptor.java | 7 +
.../tools/model/descriptor/ServiceUsage.java | 17 +
.../descriptor/TransientDetailDescriptor.java | 7 +
.../model/descriptor/ValueDetailDescriptor.java | 10 +-
.../tools/model/descriptor/package.html | 2 +-
.../polygene/tools/model/util/APIFinder.java | 4 +-
.../polygene/tools/model/util/package.html | 2 +-
.../tools/model/DocumentationSupport.java | 118 ++
.../src/test/resources/doc-support-report.json | 129 +++
tools/src/docs/envisage.txt | 55 -
tools/src/docs/yeoman_polygene.txt | 388 -------
.../cargo/step2/SequencingConcernTest.java | 36 +-
.../composites/tutorial10/HelloWorldTest.java | 16 +-
.../composites/tutorial3/HelloWorldTest.java | 16 +-
.../composites/tutorial4/HelloWorldTest.java | 16 +-
.../composites/tutorial5/HelloWorldTest.java | 16 +-
.../composites/tutorial6/HelloWorldTest.java | 16 +-
.../composites/tutorial7/HelloWorldTest.java | 16 +-
.../composites/tutorial8/HelloWorldTest.java | 18 +-
.../composites/tutorial9/HelloWorldTest.java | 18 +-
.../polygene/tutorials/hello/HelloTest4.java | 9 +-
782 files changed, 18145 insertions(+), 9670 deletions(-)
----------------------------------------------------------------------
[21/50] [abbrv] polygene-java git commit: Better explanation in
exceptions of RDF query execution.
Posted by pa...@apache.org.
Better explanation in exceptions of RDF query execution.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/007d812c
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/007d812c
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/007d812c
Branch: refs/heads/master
Commit: 007d812ccfe84a9e290c759abe57549fed444d2f
Parents: 0dac97b
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:47:40 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:47:40 2017 +0800
----------------------------------------------------------------------
.../polygene/index/rdf/query/TupleQueryExecutor.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/007d812c/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
index 2d80bd8..a515f74 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/query/TupleQueryExecutor.java
@@ -90,19 +90,15 @@ public interface TupleQueryExecutor
}
catch( RepositoryException e )
{
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Exception when executing query: " + query + "\nwith bindings " + bindings, e );
}
- catch( MalformedQueryException e )
+ catch( QueryEvaluationException | MalformedQueryException e )
{
- throw new EntityFinderException( e );
- }
- catch( QueryEvaluationException e )
- {
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Query is invalid: " + query, e );
}
catch( Exception e )
{
- throw new EntityFinderException( e );
+ throw new EntityFinderException( "Unexpected Exception while executing: " + query, e );
}
}
[20/50] [abbrv] polygene-java git commit: Making
ElasticSearchIndexingException extend from IndexingException
Posted by pa...@apache.org.
Making ElasticSearchIndexingException extend from IndexingException
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/0dac97bf
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/0dac97bf
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/0dac97bf
Branch: refs/heads/master
Commit: 0dac97bff2b82a34162c53ac9d403f19f066aca1
Parents: 5462924
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:41:27 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:41:27 2017 +0800
----------------------------------------------------------------------
.../elasticsearch/ElasticSearchIndexingException.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/0dac97bf/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
index b578c6a..27b6a19 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexingException.java
@@ -19,17 +19,18 @@
*/
package org.apache.polygene.index.elasticsearch;
-public class ElasticSearchIndexingException extends RuntimeException
+import org.apache.polygene.api.indexing.IndexingException;
+
+public class ElasticSearchIndexingException extends IndexingException
{
- public ElasticSearchIndexingException( String string )
+ public ElasticSearchIndexingException( String message )
{
- super( string );
+ super( message );
}
- public ElasticSearchIndexingException( String string, Throwable thrwbl )
+ public ElasticSearchIndexingException( String message, Throwable cause )
{
- super( string, thrwbl );
+ super( message, cause );
}
-
}
[25/50] [abbrv] polygene-java git commit: Forgot to assemble Shiro
module
Posted by pa...@apache.org.
Forgot to assemble Shiro module
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/53fe704e
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/53fe704e
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/53fe704e
Branch: refs/heads/master
Commit: 53fe704e239c852dcbe26925249329d93b0f3f17
Parents: f838035
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 11:42:44 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:12:53 2017 +0200
----------------------------------------------------------------------
.../templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/53fe704e/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index 98fc77a..84c6226 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -62,7 +62,8 @@ public class HttpServerModule
{
<% if( hasFeature('security') ) {
%> new HttpShiroAssembler()
- .withConfig( module, Visibility.module );
+ .withConfig( module, Visibility.module )
+ .assemble( module );
module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("web-shiro.ini");
new SecureJettyServiceAssembler()
.withConfig( module, Visibility.layer )
[46/50] [abbrv] polygene-java git commit: Set UTF-8 as default JVM
encoding for the whole build
Posted by pa...@apache.org.
Set UTF-8 as default JVM encoding for the whole build
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ae9506a3
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ae9506a3
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ae9506a3
Branch: refs/heads/master
Commit: ae9506a31fc71d5d46cf6a7d01ef665e2e697654
Parents: 82dd636
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 10:54:35 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 10:54:35 2017 +0200
----------------------------------------------------------------------
gradle.properties | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ae9506a3/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index ee0e41c..e9e70aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,6 @@
# limitations under the License.
#
+systemProp.file.encoding=UTF-8
+
org.gradle.jvmargs=-Xms2g -Xmx2g
[38/50] [abbrv] polygene-java git commit: Set the delay for the test
back to 3 seconds.
Posted by pa...@apache.org.
Set the delay for the test back to 3 seconds.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/4f89ad99
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/4f89ad99
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/4f89ad99
Branch: refs/heads/master
Commit: 4f89ad99f9e39d30e9f39f75d76c6a8175bddc77
Parents: fde1295
Author: niclas <ni...@hedhman.org>
Authored: Sat Jul 15 18:15:25 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sat Jul 15 18:15:25 2017 +0800
----------------------------------------------------------------------
.../polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4f89ad99/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
index 41669f2..d1dd952 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/polygene/entitystore/sql/PostgreSQLEntityStoreTestSuite.java
@@ -44,7 +44,7 @@ public class PostgreSQLEntityStoreTestSuite extends EntityStoreTestSuite
{
@ClassRule
public static final DockerRule DOCKER = new DockerRule( "postgres",
- 10000L,
+ 3000L,
"PostgreSQL init process complete; ready for start up." );
@Override
[17/50] [abbrv] polygene-java git commit: Added IndexingException,
since no organized exception hierarchy exists for that.
Posted by pa...@apache.org.
Added IndexingException, since no organized exception hierarchy exists for that.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/9778ca0f
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/9778ca0f
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/9778ca0f
Branch: refs/heads/master
Commit: 9778ca0f13c9151591014a8d0facacf8e560ec46
Parents: 58b8174
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:37:44 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:37:44 2017 +0800
----------------------------------------------------------------------
.../polygene/spi/query/IndexingException.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9778ca0f/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
new file mode 100644
index 0000000..6fc8124
--- /dev/null
+++ b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.spi.query;
+
+/**
+ * This is the exception for Indexing problems. Subtypes should be created for specific problems.
+ *
+ */
+public abstract class IndexingException extends RuntimeException
+{
+ public IndexingException( String message )
+ {
+ super( message );
+ }
+ public IndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
[09/50] [abbrv] polygene-java git commit: Stanislav correctly
identified a new regexp to be used.
Posted by pa...@apache.org.
Stanislav correctly identified a new regexp to be used.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c9d8c249
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c9d8c249
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c9d8c249
Branch: refs/heads/master
Commit: c9d8c249642d6edb2ea29409a462a25ff0efc9cb
Parents: 8393d86
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 09:48:37 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 09:48:37 2017 +0800
----------------------------------------------------------------------
.../index/sql/support/skeletons/AbstractSQLStartup.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c9d8c249/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
index e2d2cc6..6a8aa12 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/AbstractSQLStartup.java
@@ -1654,9 +1654,14 @@ public abstract class AbstractSQLStartup
+ Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END )
+ Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(.*)"
+ Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END )
- + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START ) + "(" + "[^"
+ + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_START )
+ + "([^"
+ Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR )
- + "]+)" + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" );
+ + "]+)"
+ + "(,[^"
+ + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END + DESCRIPTOR_TYPE_SEPARATOR )
+ + "]+)*"
+ + Pattern.quote( DESCRIPTOR_COMPONENT_SEPARATOR_END ) + "$" );
protected static String compositeDescriptorToString( LayerDescriptor layer,
ModuleDescriptor module, CompositeDescriptor descriptor )
[24/50] [abbrv] polygene-java git commit: Fix bugs in generator.
Posted by pa...@apache.org.
Fix bugs in generator.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/cdec0e8b
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/cdec0e8b
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/cdec0e8b
Branch: refs/heads/master
Commit: cdec0e8b6c82e60aeff6c638348a8acb0cdc7c3d
Parents: 047380a
Author: niclas <ni...@hedhman.org>
Authored: Mon Jul 10 11:32:52 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Mon Jul 10 11:32:52 2017 +0800
----------------------------------------------------------------------
.../templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 2 +-
.../app/templates/InfrastructureLayer/IndexingModule/module.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cdec0e8b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index 84c6226..744d8fd 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -64,7 +64,7 @@ public class HttpServerModule
%> new HttpShiroAssembler()
.withConfig( module, Visibility.module )
.assemble( module );
- module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("web-shiro.ini");
+ module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("classpath:web-shiro.ini");
new SecureJettyServiceAssembler()
.withConfig( module, Visibility.layer )
.visibleIn( Visibility.layer )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cdec0e8b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
index bbcfb28..dfefccb 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
@@ -35,7 +35,7 @@ module.exports = {
'InfrastructureLayer/IndexingModule/indexing/solrconfig.xml',
'solrconfig.xml'
);
- p.copyTemplate(
+ p.copyToConfig(
p.ctx,
'InfrastructureLayer/IndexingModule/indexing/solr-schema.xml',
'schema.xml'
[28/50] [abbrv] polygene-java git commit: SqlIndexingException
Posted by pa...@apache.org.
SqlIndexingException
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ce231066
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ce231066
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ce231066
Branch: refs/heads/master
Commit: ce2310665623fa619aecb16ebc4ed55b3bc2cc2d
Parents: 2c3be20
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:38:06 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:23 2017 +0200
----------------------------------------------------------------------
.../support/skeletons/SqlIndexingException.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ce231066/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
new file mode 100644
index 0000000..cfa3b80
--- /dev/null
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.index.sql.support.skeletons;
+
+import org.apache.polygene.spi.query.IndexingException;
+
+@SuppressWarnings( "WeakerAccess" )
+public class SqlIndexingException extends IndexingException
+{
+ public SqlIndexingException( String message )
+ {
+ super( message );
+ }
+
+ public SqlIndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
[29/50] [abbrv] polygene-java git commit: Move IndexingException to
API
Posted by pa...@apache.org.
Move IndexingException to API
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/460bd5c0
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/460bd5c0
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/460bd5c0
Branch: refs/heads/master
Commit: 460bd5c0aaa0abca29bb79c22c4037605d704e26
Parents: ce23106
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:40:03 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:30 2017 +0200
----------------------------------------------------------------------
.../api/indexing/IndexingException.java | 17 ++++++++++
.../MissingIndexingSystemException.java | 34 +++++++++++++++++++
.../query/MissingIndexingSystemException.java | 35 --------------------
.../polygene/spi/query/IndexingException.java | 17 ----------
.../support/skeletons/SqlIndexingException.java | 2 +-
5 files changed, 52 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/460bd5c0/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
new file mode 100644
index 0000000..59bacdb
--- /dev/null
+++ b/core/api/src/main/java/org/apache/polygene/api/indexing/IndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.api.indexing;
+
+/**
+ * This is the exception for Indexing problems. Subtypes should be created for specific problems.
+ *
+ */
+public abstract class IndexingException extends RuntimeException
+{
+ public IndexingException( String message )
+ {
+ super( message );
+ }
+ public IndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/460bd5c0/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java b/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.java
new file mode 100644
index 0000000..cf0fd00
--- /dev/null
+++ b/core/api/src/main/java/org/apache/polygene/api/indexing/MissingIndexingSystemException.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.api.indexing;
+
+import org.apache.polygene.api.query.QueryException;
+
+/**
+ * This Exception is thrown in <code>QueryBuilderFactory.newQueryBuilder()</code> method if
+ * no indexing subsystem has been declared in the assembly.
+ */
+public final class MissingIndexingSystemException extends IndexingException
+{
+ public MissingIndexingSystemException()
+ {
+ super( "No EntityFinder has been declared in the assembly of the application." );
+ }
+}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/460bd5c0/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java b/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
deleted file mode 100644
index e15cbee..0000000
--- a/core/api/src/main/java/org/apache/polygene/api/query/MissingIndexingSystemException.java
+++ /dev/null
@@ -1,35 +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.api.query;
-
-/**
- * This Exception is thrown in <code>QueryBuilderFactory.newQueryBuilder()</code> method if
- * no indexing subsystem has been declared in the assembly.
- */
-public final class MissingIndexingSystemException
- extends QueryException
-{
- private static final long serialVersionUID = 5147421865890379209L;
-
- public MissingIndexingSystemException()
- {
- super( "No EntityFinder has been declared in the assembly of the application." );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/460bd5c0/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
deleted file mode 100644
index 6fc8124..0000000
--- a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.polygene.spi.query;
-
-/**
- * This is the exception for Indexing problems. Subtypes should be created for specific problems.
- *
- */
-public abstract class IndexingException extends RuntimeException
-{
- public IndexingException( String message )
- {
- super( message );
- }
- public IndexingException( String message, Throwable cause )
- {
- super( message, cause );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/460bd5c0/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
index cfa3b80..7970590 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
@@ -1,6 +1,6 @@
package org.apache.polygene.index.sql.support.skeletons;
-import org.apache.polygene.spi.query.IndexingException;
+import org.apache.polygene.api.indexing.IndexingException;
@SuppressWarnings( "WeakerAccess" )
public class SqlIndexingException extends IndexingException
[12/50] [abbrv] polygene-java git commit: Removing unused imports.
Posted by pa...@apache.org.
Removing unused imports.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/bc0a510f
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/bc0a510f
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/bc0a510f
Branch: refs/heads/master
Commit: bc0a510fbf201a8ae562724e5b8f77268f858fdf
Parents: f08fd79
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 10:59:20 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 10:59:20 2017 +0800
----------------------------------------------------------------------
.../apache/polygene/library/restlet/PolygeneServerServlet.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/bc0a510f/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
index 1505e00..834dd33 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
@@ -19,16 +19,12 @@
*/
package org.apache.polygene.library.restlet;
-import java.util.List;
import javax.servlet.Servlet;
import org.apache.polygene.api.injection.scope.Structure;
import org.apache.polygene.api.mixin.Mixins;
import org.apache.polygene.api.object.ObjectFactory;
-import org.apache.polygene.api.structure.Module;
import org.restlet.Context;
import org.restlet.ext.servlet.ServerServlet;
-import org.restlet.routing.VirtualHost;
-import org.restlet.util.ServerList;
/**
* Restlet ServerServlet backed by a org.restlet.Application object.
[11/50] [abbrv] polygene-java git commit: Removed lines used in
debugging.
Posted by pa...@apache.org.
Removed lines used in debugging.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/f08fd79c
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/f08fd79c
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/f08fd79c
Branch: refs/heads/master
Commit: f08fd79cd8bbd8ca27e3727b213cbe8910a74e3c
Parents: 2ac4012
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 09:51:49 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 09:51:49 2017 +0800
----------------------------------------------------------------------
.../org/apache/polygene/library/restlet/PolygeneServerServlet.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f08fd79c/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
index 4d2c125..1505e00 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
@@ -44,8 +44,6 @@ public interface PolygeneServerServlet extends Servlet
@Override
protected org.restlet.Application createApplication( Context parentContext )
{
- ServerList servers = getComponent().getServers();
- System.out.println(servers);
return objectFactory.newObject( PolygeneRestApplication.class, parentContext.createChildContext() );
}
}
[10/50] [abbrv] polygene-java git commit: Fixes in the polygene
generator, steps closer to make it work.
Posted by pa...@apache.org.
Fixes in the polygene generator, steps closer to make it work.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2ac40125
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2ac40125
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2ac40125
Branch: refs/heads/master
Commit: 2ac401253a3d550ab8bcf08063ac1ef056cfed4c
Parents: c9d8c24
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 09:50:08 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 09:50:08 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/index.js | 3 +
.../HttpServerModule/bootstrap.tmpl | 10 +-
.../DomainLayer/DomainModule/module.js | 4 +-
.../StorageModule/bootstrap.tmpl | 4 +-
.../InfrastructureLayer/StorageModule/module.js | 2 -
.../storage/es-cassandra.properties | 37 ++--
.../RestAPIApplication/Launcher.java.tmpl | 12 +-
.../app/templates/RestAPIApplication/SETUP.tmpl | 41 +++++
.../app/templates/RestAPIApplication/app.js | 14 ++
.../customUnixStartScript.txt | 175 +++++++++++++++++++
.../customWindowsStartScript.txt | 89 ++++++++++
.../app/templates/buildtool/gradle-app.tmpl | 35 ++--
12 files changed, 386 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/index.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/index.js b/tools/generator-polygene/app/index.js
index a20b3eb..434e74e 100644
--- a/tools/generator-polygene/app/index.js
+++ b/tools/generator-polygene/app/index.js
@@ -290,6 +290,9 @@ function assignFunctions(polygene) {
polygene.copyTemplate(ctx,
from,
'app/src/dist/config/production/' + toName);
+ polygene.copyTemplate(ctx,
+ from,
+ 'app/src/test/resources/' + toName);
};
polygene.copyTemplate = function (ctx, from, to) {
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
index d30c1f3..98fc77a 100644
--- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl
@@ -47,10 +47,10 @@ public class HttpServerModule
{<% if( hasFeature('security') ) { %>
private static final int DEFAULT_PORT = 8443;
public static final String KS_PASSWORD = "1234"; // TODO: Secure the key stores
- public static final String SERVER_KEYSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.key";
- public static final String SERVER_KEYSTORE_TYPE = "JCEKS";
- public static final String TRUSTSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.key";
- public static final String TRUSTSTORE_TYPE = "JCEKS";
+ public static final String SERVER_KEYSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.p12";
+ public static final String SERVER_KEYSTORE_TYPE = "PKCS12";
+ public static final String TRUSTSTORE_FILENAME = "security/<%= polygene.name.toLowerCase() %>-app.p12";
+ public static final String TRUSTSTORE_TYPE = "PKCS12";
<% } else {
%> protected static final int DEFAULT_PORT = 8080;
<% } %>
@@ -70,7 +70,7 @@ public class HttpServerModule
.assemble( module );
SecureJettyConfiguration defaults = module.forMixin( SecureJettyConfiguration.class ).declareDefaults();
defaults.keystorePath().set( new File( SERVER_KEYSTORE_FILENAME ).getAbsolutePath() );
- defaults.keystoreType().set( "JCEKS" );
+ defaults.keystoreType().set( SERVER_KEYSTORE_TYPE );
defaults.keystorePassword().set( KS_PASSWORD );
defaults.truststorePath().set( new File( TRUSTSTORE_FILENAME ).getAbsolutePath() );
defaults.truststoreType().set( TRUSTSTORE_TYPE );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/DomainLayer/DomainModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/module.js b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/module.js
index f511c0f..4051cf7 100644
--- a/tools/generator-polygene/app/templates/DomainLayer/DomainModule/module.js
+++ b/tools/generator-polygene/app/templates/DomainLayer/DomainModule/module.js
@@ -76,7 +76,9 @@ function copyConfigurationPropertiesFile(p, composites) {
if (composites.hasOwnProperty(idx)) {
p.current.clazz = composites[idx];
p.prepareClazz(p.current);
- p.copyToConfig(p.ctx,'DomainLayer/DomainModule/config.properties.tmpl', p.current.clazz.name + '.properties');
+ var configurationFile = 'DomainLayer/DomainModule/config.properties.tmpl';
+ var destFileName = p.current.clazz.name + '.properties';
+ p.copyToConfig(p.ctx,configurationFile, destFileName);
}
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl
index 4220bd9..8a990c8 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/bootstrap.tmpl
@@ -87,9 +87,7 @@ if( polygene.entitystore.indexOf( 'SQL' ) >= 0 ) {
.assemble( module );
<%
if( polygene.entitystore === 'Cassandra' ) {
-%> configModule.forMixin( CassandraEntityStoreConfiguration.class )
- .declareDefaults()
- .createIfMissing().set( true );
+%> configModule.forMixin( CassandraEntityStoreConfiguration.class );
<%
}
%>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js
index c61466f..f1373f3 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/module.js
@@ -37,12 +37,10 @@ module.exports = {
} else {
var esSqlFileName = 'InfrastructureLayer/StorageModule/storage/es-sql.properties';
p.copyToConfig(p.ctx, esSqlFileName, esFileName);
- p.copyTemplate(p.ctx, esSqlFileName, 'app/src/test/resources/' + esFileName );
var dsFileName = 'ds-es-' + p.entitystore.toLowerCase() + '.properties';
var datasourceFile = 'InfrastructureLayer/StorageModule/storage/' + dsFileName;
p.copyToConfig(p.ctx, datasourceFile, dsFileName);
- p.copyTemplate(p.ctx, datasourceFile, 'app/src/test/resources/' + dsFileName)
}
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/es-cassandra.properties
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/es-cassandra.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/es-cassandra.properties
index 5ad0cab..5a68236 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/es-cassandra.properties
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/es-cassandra.properties
@@ -24,27 +24,34 @@
# Also not that Cassandra refuse to bind to all interfaces on a host, so you
# need to know which hostname corresponds to the interface that Cassandra is
# bound to. This may not include 'localhost'.
-# Defaults: null
-# hostnames=
+# Defaults: null
+# hostnames=
+
# The name of the cluster to connect to.
-# Defaults: polygene-cluster
-# clusterName=polygene-cluster
+# Defaults: polygene-cluster
+# clusterName=polygene-cluster
+
# The replication factor to be used, if a KEYSPACE is created.
-# Defaults: 3
-# replicationFactor=3
+# Defaults: 3
+# replicationFactor=3
+
# The Cassandra client uses the CQL interface, and typically needs a username
# and password.
-# Defaults: no user name will be attempted.
-# username=
-# password=
+# Defaults: no user name will be attempted.
+# username=
+# password=
+
# The name of the KEYSPACE to be used.
-# Defaults:polygene
-# keySpace=polygene
+# Defaults:polygene
+# keySpace=polygene
+
# The name of the entity TABLE to be used.
# All entities are stored in the same table, with one entity per row.
-# Defaults: entitystore
-# entityTableName=entitystore
+# Defaults: entitystore
+# entityTableName=entitystore
+
# Defines whether a KEYSPACE and entity TABLE should be created if not already
# present in the Cassandra cluster.
-# Defaults: false
-# createIfMissing=false
\ No newline at end of file
+# Defaults: false
+# createIfMissing=false
+createIfMissing=true
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
index 2acdca1..40d3dfd 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/Launcher.java.tmpl
@@ -32,7 +32,7 @@ public class <%= polygene.name %>Launcher extends PolygeneRestApplicationLaunche
{
private static final String name = "<%= polygene.name %>";
private static final String version = "0.1";
- private Application.Mode mode = Application.Mode.development;
+ private Application.Mode mode = getApplicationMode();
public static void main( String[] args )
throws Exception
@@ -69,4 +69,14 @@ public class <%= polygene.name %>Launcher extends PolygeneRestApplicationLaunche
{
return RestApiModule.NAME;
}
+
+ private Application.Mode getApplicationMode()
+ {
+ String mode = System.getenv( "APP_MODE" );
+ if( mode == null )
+ {
+ return Application.Mode.development;
+ }
+ return Application.Mode.valueOf( mode );
+ }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/RestAPIApplication/SETUP.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/SETUP.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/SETUP.tmpl
new file mode 100644
index 0000000..d5d95ad
--- /dev/null
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/SETUP.tmpl
@@ -0,0 +1,41 @@
+<%
+if( polygene.entitystore == 'PostgreSQL' || polygene.indexing == 'SQL' ) {
+%>
+Start Postgres in Docker
+=========================
+ docker run -p 5432:5432 --name polygene-postgres -d postgres
+
+Connect to Postgres via Docker
+==============================
+ docker run -it --rm --link polygene-postgres:postgres postgres psql -h postgres -U postgres
+
+Setting up Postgresql database
+==============================
+In the psql command shell, execute the following commands (must have elevated
+permissions, such as user 'postgres'
+
+ CREATE USER polygene WITH PASSWORD 'ThisIsGreat!';
+ CREATE DATABASE <%= polygene.name.toLowerCase() %>;
+ GRANT ALL ON DATABASE <%= polygene.name.toLowerCase() %> TO polygene;
+ \connect <%= polygene.name.toLowerCase() %>
+ CREATE EXTENSION ltree;
+ \q
+<%
+}
+%>
+<%
+if( polygene.entitystore == 'Cassandra' ) {
+%>
+Start Cassandra in Docker
+=========================
+ docker run -d -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 --name polygene-cassandra cassandra
+ docker logs -f polygene-cassandra
+
+and wait for the following log message to appear.
+
+ Starting listening for CQL clients on /0.0.0.0:9042 (unencrypted)...
+
+after that you can Ctrl-C back to command line.
+<%
+}
+%>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/RestAPIApplication/app.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/app.js b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
index ceed39e..610b9af 100644
--- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js
@@ -46,6 +46,20 @@ module.exports = {
p.copyTemplate(p.ctx,
'RestAPIApplication/bootstrap.tmpl',
'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/' + p.name + 'ApplicationAssembler.java');
+
+ p.copyTemplate(p.ctx,
+ 'RestAPIApplication/SETUP.tmpl',
+ 'SETUP.txt');
+
+ p.ctx.fs.copy(
+ p.ctx.templatePath('RestAPIApplication/customUnixStartScript.txt'),
+ p.ctx.destinationPath('app/src/scripts/customUnixStartScript.txt')
+ );
+
+ p.ctx.fs.copy(
+ p.ctx.templatePath('RestAPIApplication/customWindowsStartScript.txt'),
+ p.ctx.destinationPath('app/src/scripts/customWindowsStartScript.txt')
+ );
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt b/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
new file mode 100644
index 0000000..fd23f57
--- /dev/null
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/customUnixStartScript.txt
@@ -0,0 +1,175 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## ${applicationName} start up script for UN*X
+##
+##############################################################################
+
+# default to 'development' mode
+if [ -z \$APP_MODE ] ; then
+ export APP_MODE=development
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: \$0 may be a link
+PRG="\$0"
+# Need this for relative symlinks.
+while [ -h "\$PRG" ] ; do
+ ls=`ls -ld "\$PRG"`
+ link=`expr "\$ls" : '.*-> \\(.*\\)\$'`
+ if expr "\$link" : '/.*' > /dev/null; then
+ PRG="\$link"
+ else
+ PRG=`dirname "\$PRG"`"/\$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"\$PRG\"`/${appHomeRelativePath}" >/dev/null
+APP_HOME="`pwd -P`"
+cd "\$SAVED" >/dev/null
+
+APP_NAME="${applicationName}"
+APP_BASE_NAME=`basename "\$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "\$*"
+}
+
+die () {
+ echo
+ echo "\$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=\$APP_HOME/config/\$APP_MODE:$classpath
+
+# Determine the Java command to use to start the JVM.
+if [ -n "\$JAVA_HOME" ] ; then
+ if [ -x "\$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="\$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="\$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "\$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: \$JAVA_HOME
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "\$cygwin" = "false" -a "\$darwin" = "false" -a "\$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ \$? -eq 0 ] ; then
+ if [ "\$MAX_FD" = "maximum" -o "\$MAX_FD" = "max" ] ; then
+ MAX_FD="\$MAX_FD_LIMIT"
+ fi
+ ulimit -n \$MAX_FD
+ if [ \$? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: \$MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: \$MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if \$darwin; then
+ GRADLE_OPTS="\$GRADLE_OPTS \\"-Xdock:name=\$APP_NAME\\" \\"-Xdock:icon=\$APP_HOME/media/gradle.icns\\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if \$cygwin ; then
+ APP_HOME=`cygpath --path --mixed "\$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "\$CLASSPATH"`
+ JAVACMD=`cygpath --unix "\$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in \$ROOTDIRSRAW ; do
+ ROOTDIRS="\$ROOTDIRS\$SEP\$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^(\$ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "\$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="\$OURCYGPATTERN|(\$GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "\$@" ; do
+ CHECK=`echo "\$arg"|egrep -c "\$OURCYGPATTERN" -`
+ CHECK2=`echo "\$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ \$CHECK -ne 0 ] && [ \$CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args\$i`=`cygpath --path --ignore --mixed "\$arg"`
+ else
+ eval `echo args\$i`="\"\$arg\""
+ fi
+ i=\$((i+1))
+ done
+ case \$i in
+ (0) set -- ;;
+ (1) set -- "\$args0" ;;
+ (2) set -- "\$args0" "\$args1" ;;
+ (3) set -- "\$args0" "\$args1" "\$args2" ;;
+ (4) set -- "\$args0" "\$args1" "\$args2" "\$args3" ;;
+ (5) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" ;;
+ (6) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" ;;
+ (7) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" ;;
+ (8) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" ;;
+ (9) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" "\$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\\\n "\$i" | sed "s/'/'\\\\\\\\''/g;1s/^/'/;\\\$s/\\\$/' \\\\\\\\/" ; done
+ echo " "
+}
+APP_ARGS=\$(save "\$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" ${mainClassName} "\$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "\$(uname)" = "Darwin" ] && [ "\$HOME" = "\$PWD" ]; then
+ cd "\$(dirname "\$0")"
+fi
+
+exec "\$JAVACMD" "\$@"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt b/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
new file mode 100644
index 0000000..e891013
--- /dev/null
+++ b/tools/generator-polygene/app/templates/RestAPIApplication/customWindowsStartScript.txt
@@ -0,0 +1,89 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem ${applicationName} startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%${appHomeRelativePath}
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto setmode
+
+set CMD_LINE_ARGS=%*
+
+:setmode
+if "x%APP_MODE%" <> "x" goto execute
+set APP_MODE=development
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\\config\\%APP_MODE%;$classpath
+
+@rem Execute ${applicationName}
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %${optsEnvironmentVar}% <% if ( appNameSystemProperty ) { %>"-D${appNameSystemProperty}=%APP_BASE_NAME%"<% } %> -classpath "%CLASSPATH%" ${mainClassName} %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable ${exitEnvironmentVar} if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%${exitEnvironmentVar}%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2ac40125/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
index 441cdec..22cd161 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
@@ -17,24 +17,29 @@
*
*
-%>
-
-
apply plugin: 'application'
mainClassName="<%= polygene.packageName %>.app.<%= polygene.name %>Launcher"
-applicationDefaultJvmArgs=[]
-// GC Tuning strategies, see https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/
-// Strict memory bound
-// applicationDefaultJvmArgs << "-Xmx512M -Xms512M"
-//
-// Goal oriented, "throughput" and "max pause"
-// applicationDefaultJvmArgs << "-XX:MaxGCPauseMillis=300 -XX:GCTimeRatio=19"
-//
-// Garbage Collector
-// OneOf; -XX:+UseG1GC, -XX:+UseConcMarkSweepGC, -XX:-UseParallelOldGC, -XX:+UseSerialGC
-applicationDefaultJvmArgs << "-XX:+UseG1GC"
+startScripts {
+ applicationName = "<%= polygene.name %>"
+ optsEnvironmentVar = "<%= polygene.name.toUpperCase() %>_OPTS"
+
+ // GC Tuning strategies, see https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/
+ // Strict memory bound
+ // defaultJvmOpts << "-Xmx512M -Xms512M"
+
+ // Goal oriented, "throughput" and "max pause"
+ // defaultJvmOpts << "-XX:MaxGCPauseMillis=300 -XX:GCTimeRatio=19"
+ // Garbage Collector
+ // OneOf; -XX:+UseG1GC, -XX:+UseConcMarkSweepGC, -XX:-UseParallelOldGC, -XX:+UseSerialGC
+ defaultJvmOpts << "-XX:+UseG1GC"
+
+ // Custom start scripts
+ unixStartScriptGenerator.template = resources.text.fromFile('src/scripts/customUnixStartScript.txt')
+ windowsStartScriptGenerator.template = resources.text.fromFile('src/scripts/customWindowsStartScript.txt')
+}
dependencies {
implementation project( ":bootstrap" )
@@ -104,3 +109,7 @@ if( polygene.entitystore == 'SQLite' ) {
testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
testImplementation "com.github.tdomzal:junit-docker-rule:0.3"
}
+
+tasks.withType(Tar){
+ compression = Compression.GZIP
+}
[07/50] [abbrv] polygene-java git commit: Ouch... missed an equal
sign.
Posted by pa...@apache.org.
Ouch... missed an equal sign.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c543db57
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c543db57
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c543db57
Branch: refs/heads/master
Commit: c543db57936cc504e140349e111f2ecddfd89f03
Parents: cf12e4b
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 2 23:34:49 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 2 23:34:49 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c543db57/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
index 6ec2b7f..60dbb70 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
@@ -33,7 +33,7 @@ rootProject.ext {
<%
}
if( polygene.entitystore == 'DerbySQL' ) {
-%> derbyVersion "10.13.1.1"
+%> derbyVersion = "10.13.1.1"
<%
}
if( polygene.entitystore == 'H2SQL' ) {
[33/50] [abbrv] polygene-java git commit: Fixed that Assmeblers tries
to warn if assemble() method is forgotten.
Posted by pa...@apache.org.
Fixed that Assmeblers tries to warn if assemble() method is forgotten.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/47c66694
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/47c66694
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/47c66694
Branch: refs/heads/master
Commit: 47c6669401e716f53886c2c91ca4a14ffef52d02
Parents: d346b7d
Author: niclas <ni...@hedhman.org>
Authored: Mon Jul 10 11:32:32 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:58 2017 +0200
----------------------------------------------------------------------
.../polygene/api/query/QueryBuilderFactory.java | 2 +
.../apache/polygene/bootstrap/Assemblers.java | 56 +++++++++++++++++---
.../runtime/unitofwork/ModuleUnitOfWork.java | 3 +-
.../polygene/test/EntityTestAssembler.java | 1 +
.../ehcache/assembly/EhCacheAssembler.java | 1 +
.../memcache/assembly/MemcacheAssembler.java | 1 +
.../assembly/CassandraEntityStoreAssembler.java | 1 +
.../file/assembly/FileEntityStoreAssembler.java | 1 +
.../assembly/GeodeEntityStoreAssembler.java | 1 +
.../assembly/HazelcastEntityStoreAssembler.java | 1 +
.../assembly/JCloudsEntityStoreAssembler.java | 1 +
.../jdbm/assembly/JdbmEntityStoreAssembler.java | 1 +
.../assembly/LevelDBEntityStoreAssembler.java | 1 +
.../assembly/MemoryEntityStoreAssembler.java | 1 +
.../assembly/MongoDBEntityStoreAssembler.java | 1 +
.../PreferencesEntityStoreAssembler.java | 1 +
.../assembly/RedisEntityStoreAssembler.java | 1 +
.../riak/assembly/RiakEntityStoreAssembler.java | 1 +
.../AbstractSQLEntityStoreAssembler.java | 1 +
.../assembly/ESClientIndexQueryAssembler.java | 1 +
.../assembly/ESClusterIndexQueryAssembler.java | 1 +
.../ESFilesystemIndexQueryAssembler.java | 1 +
.../solr/assembly/SolrIndexingAssembler.java | 1 +
.../AbstractSQLIndexQueryAssembler.java | 1 +
.../assembly/CodahaleMetricsAssembler.java | 1 +
.../JavaxJsonSerializationAssembler.java | 1 +
.../JavaxXmlSerializationAssembler.java | 1 +
.../MessagePackSerializationAssembler.java | 1 +
.../library/alarm/AlarmSystemAssembler.java | 1 +
.../fileconfig/FileConfigurationAssembler.java | 1 +
.../library/http/JettyServiceAssembler.java | 1 +
.../library/rest/client/RssReaderTest.java | 52 ++++++++----------
.../library/rest/admin/RestAssembler.java | 1 +
.../assembly/RestletCrudModuleAssembler.java | 1 +
.../shiro/assembly/PasswordDomainAssembler.java | 1 +
.../assembly/PermissionsDomainAssembler.java | 1 +
.../assembly/StandaloneShiroAssembler.java | 1 +
.../shiro/web/assembly/HttpShiroAssembler.java | 1 +
.../sql/liquibase/LiquibaseAssembler.java | 1 +
...bstractPooledDataSourceServiceAssembler.java | 1 +
.../sql/assembly/DataSourceAssembler.java | 1 +
.../sql/assembly/DataSourceJMXAssembler.java | 1 +
.../assembly/ExternalDataSourceAssembler.java | 1 +
.../assembly/PersistingSequencingAssembler.java | 1 +
.../assembly/TransientSequencingAssembler.java | 1 +
.../uid/uuid/assembly/UuidServiceAssembler.java | 1 +
.../uowfile/bootstrap/UoWFileAssembler.java | 1 +
47 files changed, 117 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java b/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
index 19ee958..de1a3a1 100644
--- a/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
+++ b/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
@@ -19,6 +19,8 @@
*/
package org.apache.polygene.api.query;
+import org.apache.polygene.api.indexing.MissingIndexingSystemException;
+
/**
* This is used to create QueryBuilders.
*
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
index b24a5e6..7efcd6d 100644
--- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
+++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
@@ -117,7 +117,7 @@ public class Assemblers
* Assembler with Visibility adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Visibility<AssemblerType>
+ public static abstract class Visibility<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>
{
private org.apache.polygene.api.common.Visibility visibility = org.apache.polygene.api.common.Visibility.module;
@@ -141,7 +141,7 @@ public class Assemblers
* Assembler with Identity adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Identity<AssemblerType>
+ public static abstract class Identity<AssemblerType> extends AssembleChecker
implements Identifiable<AssemblerType>
{
private String identity;
@@ -171,7 +171,7 @@ public class Assemblers
* Assembler with Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Config<AssemblerType>
+ public static abstract class Config<AssemblerType> extends AssembleChecker
implements Configurable<AssemblerType>
{
private ModuleAssembly configModule = null;
@@ -210,7 +210,7 @@ public class Assemblers
* Assembler with Visibility and Identity adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityIdentity<AssemblerType>
+ public static abstract class VisibilityIdentity<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Identifiable<AssemblerType>
{
@@ -256,7 +256,7 @@ public class Assemblers
* Assembler with Visibility and Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityConfig<AssemblerType>
+ public static abstract class VisibilityConfig<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Configurable<AssemblerType>
{
@@ -311,7 +311,7 @@ public class Assemblers
* Assembler with Identity and Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class IdentityConfig<AssemblerType>
+ public static abstract class IdentityConfig<AssemblerType> extends AssembleChecker
implements Identifiable<AssemblerType>,
Configurable<AssemblerType>
{
@@ -372,7 +372,7 @@ public class Assemblers
* Assembler with Visibility, Identity and Configuation adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityIdentityConfig<AssemblerType>
+ public static abstract class VisibilityIdentityConfig<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Identifiable<AssemblerType>,
Configurable<AssemblerType>
@@ -445,4 +445,46 @@ public class Assemblers
}
}
+ public static abstract class AssembleChecker
+ implements Assembler
+ {
+ private boolean assembled = false;
+
+ @Override
+ public void assemble( ModuleAssembly module )
+ throws AssemblyException
+ {
+ assembled = true;
+ }
+
+ @Override
+ protected void finalize()
+ throws Throwable
+ {
+ super.finalize();
+ if( !assembled )
+ {
+ System.err.println( "WARNING!!!!!" );
+ System.err.println( "############################################################################" );
+ System.err.println( "##" );
+ System.err.println( "## The " + getClass().getName() + " assembler was not assembled." );
+ System.err.println( "##" );
+ System.err.println( "## Expect that some functionality to be missing or incorrect." );
+ System.err.println( "##" );
+ if( getClass().getName().startsWith( "org.apache.polygene" ))
+ {
+ System.err.println( "## When instantiating a provided Assembler, you must call the assemble(module)" );
+ System.err.println( "## method after setting the options. This was not done." );
+ }
+ else
+ {
+ System.err.println( "## When overriding any helper class in org.apache.polygene.bootstrap.Assemblers" );
+ System.err.println( "## you must call super.assemble(module) in the assmeble(ModuleAssembly module)" );
+ System.err.println( "## method. This was not done, OR that you forgot to call assemble() method " );
+ System.err.println( "## after instantiating and setting the options." );
+ }
+ System.err.println( "############################################################################" );
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
index 0cf26f0..f72cb37 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
@@ -547,7 +547,8 @@ public class ModuleUnitOfWork
return ( (EntityInstance) compositeInstanceOf( (Composite) entity ) ).entityState();
}
- private static class UoWQuerySource implements QuerySource
+ private static class UoWQuerySource
+ implements QuerySource
{
private final ModuleUnitOfWork moduleUnitOfWork;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java b/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
index 36827b8..4dbe625 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
@@ -42,6 +42,7 @@ public class EntityTestAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
index 8a4d4f8..e99a379 100644
--- a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
+++ b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
@@ -31,6 +31,7 @@ public class EhCacheAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( EhCachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
index 92a76db..20886ec 100644
--- a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
+++ b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
@@ -34,6 +34,7 @@ public class MemcacheAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemcachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
index ab6193f..51f726b 100644
--- a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
+++ b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
@@ -30,6 +30,7 @@ public class CassandraEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( CassandraEntityStoreService.class )
.visibleIn( visibility() )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
index 13e1ad8..40fdf35 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class FileEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( FileEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java b/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
index fbb68de..8bc98c9 100644
--- a/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
+++ b/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class GeodeEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( GeodeEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java b/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
index ae5ad69..be0c8a8 100644
--- a/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
+++ b/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class HazelcastEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( HazelcastEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java b/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
index d586f1b..aba1e32 100644
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
@@ -32,6 +32,7 @@ public class JCloudsEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( JCloudsEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java b/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
index 175b6db..f48d3cb 100644
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class JdbmEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( JdbmEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
index 4f8f2b7..1a8a26a 100644
--- a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
+++ b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class LevelDBEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( LevelDBEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java b/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
index b593442..6b11a85 100644
--- a/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
+++ b/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
@@ -33,6 +33,7 @@ public class MemoryEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java b/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
index c3d40ec..f212a8d 100644
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class MongoDBEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MongoDBEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java b/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
index f3b0de5..4f6725a 100644
--- a/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
+++ b/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class PreferencesEntityStoreAssembler extends Assemblers.VisibilityIdenti
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
String applicationName = module.layer().application().name();
Preferences root = Preferences.userRoot();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java b/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
index 4f521a2..7c1ebca 100644
--- a/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
+++ b/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class RedisEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( RedisEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java b/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
index ce538f6..9c67e31 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
@@ -33,6 +33,7 @@ public class RiakEntityStoreAssembler
@Override
public void assemble(ModuleAssembly module)
{
+ super.assemble( module );
ServiceDeclaration service = module.services( RiakEntityStoreService.class ).
withMixins( RiakEntityStoreMixin.class ).
visibleIn( visibility() );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java b/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
index c25a3cd..0f86490 100644
--- a/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
+++ b/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
@@ -44,6 +44,7 @@ public abstract class AbstractSQLEntityStoreAssembler<AssemblerType>
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
SQLDialect dialect = getSQLDialect();
if( dialect == null )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
index 1a8a3a2..7b118d4 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
@@ -36,6 +36,7 @@ public class ESClientIndexQueryAssembler
@Override
public void assemble( final ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESClientIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
index 9056cd3..2158059 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
@@ -30,6 +30,7 @@ public class ESClusterIndexQueryAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESClusterIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
index 1dfb9bb..d401321 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
@@ -30,6 +30,7 @@ public class ESFilesystemIndexQueryAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESFilesystemIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
index 4932cdc..ab0e3c8 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
@@ -31,6 +31,7 @@ public class SolrIndexingAssembler extends Assemblers.VisibilityIdentityConfig<S
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( EmbeddedSolrService.class ).identifiedBy( "solr" ).instantiateOnStartup();
module.services( SolrQueryService.class )
.taggedWith( "solr", "search", "indexing", "query" )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
index b5e861c..6c931be 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
@@ -62,6 +62,7 @@ public abstract class AbstractSQLIndexQueryAssembler<AssemblerType> extends Asse
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
try
{
SQLVendor sqlVendor = getSQLVendor();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java b/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
index 0281d12..f2bd5d6 100644
--- a/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
+++ b/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
@@ -108,6 +108,7 @@ public class CodahaleMetricsAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service =
module.services( CodahaleMetricsProvider.class )
.setMetaInfo( declaration )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
index 10a8622..0bd397c 100644
--- a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
+++ b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
@@ -45,6 +45,7 @@ public class JavaxJsonSerializationAssembler extends Assemblers.VisibilityIdenti
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( JavaxJsonSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
index e6a69f5..2385715 100644
--- a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
+++ b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
@@ -45,6 +45,7 @@ public class JavaxXmlSerializationAssembler extends Assemblers.VisibilityIdentit
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( JavaxXmlSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
index 7f87458..a262e80 100644
--- a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
+++ b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
@@ -41,6 +41,7 @@ public class MessagePackSerializationAssembler extends Assemblers.VisibilityIden
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( MessagePackSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
index 73d407b..405ca99 100644
--- a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
+++ b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
@@ -29,6 +29,7 @@ public class AlarmSystemAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration alarmSystem = module.services( AlarmSystemService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
index 6270502..bdc8d89 100644
--- a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
+++ b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
@@ -40,6 +40,7 @@ public class FileConfigurationAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( FileConfigurationService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
index d9103ce..d7ebf49 100644
--- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
+++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
@@ -54,6 +54,7 @@ public class JettyServiceAssembler
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( httpService() ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
index da9c070..a1fb7a0 100644
--- a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
@@ -33,15 +33,12 @@ import org.apache.polygene.library.rest.client.api.ContextResourceClient;
import org.apache.polygene.library.rest.client.api.ContextResourceClientFactory;
import org.apache.polygene.library.rest.client.api.ErrorHandler;
import org.apache.polygene.library.rest.client.api.HandlerCommand;
-import org.apache.polygene.library.rest.client.spi.ResponseHandler;
-import org.apache.polygene.library.rest.client.spi.ResponseReader;
import org.apache.polygene.library.rest.client.spi.ResultHandler;
import org.apache.polygene.library.rest.common.ValueAssembler;
import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.restlet.Client;
-import org.restlet.Response;
import org.restlet.data.Protocol;
import org.restlet.data.Reference;
import org.restlet.resource.ResourceException;
@@ -67,6 +64,7 @@ public class RssReaderTest
assumeConnectivity( "github.com", 443 );
}
+ @SuppressWarnings( "FieldCanBeLocal" )
private ContextResourceClient crc;
@Override
@@ -84,42 +82,34 @@ public class RssReaderTest
public void testReadRssFeed()
{
Client client = new Client( Protocol.HTTPS );
- Reference ref = new Reference( "https://github.com/Qi4j/qi4j-sdk/commits/develop.atom" );
+ Reference ref = new Reference( "https://github.com/Apache/polygene-java/commits/develop.atom" );
ContextResourceClientFactory contextResourceClientFactory = objectFactory.newObject( ContextResourceClientFactory.class, client );
- contextResourceClientFactory.registerResponseReader( new ResponseReader()
- {
- @Override
- public Object readResponse( Response response, Class<?> resultType )
- throws ResourceException
+ contextResourceClientFactory.registerResponseReader( ( response, resultType ) -> {
+ if( resultType.equals( Document.class ) )
{
- if( resultType.equals( Document.class ) )
+ try
{
- try
- {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware( false );
- return documentBuilderFactory.newDocumentBuilder().parse( response.getEntity().getStream() );
- }
- catch( Exception e )
- {
- throw new ResourceException( e );
- }
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware( false );
+ return documentBuilderFactory.newDocumentBuilder().parse( response.getEntity().getStream() );
+ }
+ catch( Exception e )
+ {
+ throw new ResourceException( e );
}
-
- return null;
}
+
+ return null;
} );
- contextResourceClientFactory.setErrorHandler( new ErrorHandler().onError( ErrorHandler.RECOVERABLE_ERROR, new ResponseHandler()
- {
- @Override
- public HandlerCommand handleResponse( Response response, ContextResourceClient client )
- {
- System.out.println( ">> REFRESH on recoverable error: " + response.getStatus() );
- return refresh();
- }
- } ) );
+ contextResourceClientFactory.setErrorHandler(
+ new ErrorHandler()
+ .onError( ErrorHandler.RECOVERABLE_ERROR,
+ ( response, client1 ) -> {
+ System.out.println( ">> REFRESH on recoverable error: " + response.getStatus() );
+ return refresh();
+ } ) );
crc = contextResourceClientFactory.newClient( ref );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
index 9641806..0bd9782 100644
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
@@ -29,6 +29,7 @@ public class RestAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.objects( RestApplication.class ).visibleIn( visibility() );
module.objects( PolygeneFinder.class,
EntitiesResource.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
index 490804b..f6c07e0 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
@@ -52,6 +52,7 @@ public class RestletCrudModuleAssembler extends Assemblers.VisibilityIdentity<Re
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module
.addServices( repositoryType )
.visibleIn( Visibility.application )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
index df2e3e4..f9c4a2d 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
@@ -32,6 +32,7 @@ public class PasswordDomainAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.entities( PasswordSecurable.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( PasswordRealmService.class ).
instantiateOnStartup().
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
index 1848a69..6609085 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
@@ -32,6 +32,7 @@ public class PermissionsDomainAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.entities( Role.class, RoleAssignment.class, RoleAssignee.class ).
visibleIn( visibility() );
module.services( RoleFactory.class ).
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
index 25ca7ba..9edf580 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
@@ -31,6 +31,7 @@ public class StandaloneShiroAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( IniSecurityManagerService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
index 01630a0..8037332 100644
--- a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
+++ b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
@@ -40,6 +40,7 @@ public class HttpShiroAssembler extends Assemblers.Config<HttpShiroAssembler>
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
addContextListeners(
listen().with( EnvironmentLoaderService.class ) )
.to( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
index d29cf8d..59f1aba 100644
--- a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
+++ b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
@@ -31,6 +31,7 @@ public class LiquibaseAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( LiquibaseService.class ).visibleIn( visibility() );
if( applyChangelogOnStartup )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
index 49ed1fe..360e34e 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
@@ -32,6 +32,7 @@ public abstract class AbstractPooledDataSourceServiceAssembler<AssemblerType>
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.values( DataSourceConfiguration.class ).visibleIn( Visibility.module );
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
index 1618cc0..adea163 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
@@ -68,6 +68,7 @@ public class DataSourceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.importedServices( DataSource.class ).
importedBy( ServiceInstanceImporter.class ).
setMetaInfo( StringIdentity.identityOf( dataSourceServiceId ) ).
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
index e65e1e7..ff6a004 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
@@ -29,6 +29,7 @@ public class DataSourceJMXAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( DataSourceConfigurationManagerService.class ).visibleIn( visibility() ).instantiateOnStartup();
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
index 2e833bb..462dee3 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
@@ -63,6 +63,7 @@ public class ExternalDataSourceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
if( circuitBreaker != null )
{
externalDataSource = DataSources.wrapWithCircuitBreaker( StringIdentity.identityOf( identity() ), externalDataSource, circuitBreaker );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
index 1a8038c..ebebe0b 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
@@ -31,6 +31,7 @@ public class PersistingSequencingAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( PersistingSequencingService.class ).visibleIn( visibility() );
module.entities( SequenceEntity.class ).visibleIn( Visibility.module );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
index a53b9a3..d32f78b 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
@@ -29,6 +29,7 @@ public class TransientSequencingAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( TransientSequencingService.class ).visibleIn( visibility() );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
index 489650d..b32d642 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
@@ -29,6 +29,7 @@ public class UuidServiceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( UuidServiceComposite.class ).visibleIn( visibility() );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/47c66694/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java b/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
index ab98a18..a85e757 100644
--- a/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
+++ b/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
@@ -41,6 +41,7 @@ public class UoWFileAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( UoWFileFactory.class ).visibleIn( visibility() );
}
}
[08/50] [abbrv] polygene-java git commit: Working on getting
everything in generator working properly.
Posted by pa...@apache.org.
Working on getting everything in generator working properly.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/8393d863
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/8393d863
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/8393d863
Branch: refs/heads/master
Commit: 8393d8633ea646504eb0d8aaf2c8022dc4d10181
Parents: c543db5
Author: niclas <ni...@hedhman.org>
Authored: Wed Jul 5 12:08:08 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Wed Jul 5 12:08:08 2017 +0800
----------------------------------------------------------------------
tools/generator-polygene/app/index.js | 12 +++----
.../indexing/ds-index-postgresql.properties | 2 +-
.../IndexingModule/module.js | 22 +++++++-----
.../storage/ds-es-postgresql.properties | 2 +-
.../app/templates/buildtool/gradle-app.tmpl | 38 +++++---------------
.../app/templates/buildtool/gradle-root.tmpl | 2 +-
6 files changed, 31 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/index.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/index.js b/tools/generator-polygene/app/index.js
index bcb7453..a20b3eb 100644
--- a/tools/generator-polygene/app/index.js
+++ b/tools/generator-polygene/app/index.js
@@ -65,6 +65,7 @@ module.exports = generators.Base.extend(
polygene.indexing = polygene.indexing ? polygene.indexing : null;
polygene.entitystore = polygene.entitystore ? polygene.entitystore : null;
polygene.caching = polygene.caching ? polygene.caching : null;
+ polygene.dbpool = polygene.dbpool === undefined ? "DBCP" : answers.dbpool;
}
},
@@ -196,14 +197,13 @@ module.exports = generators.Base.extend(
this.log('Caching:', answers.caching);
this.log('Metrics:', answers.metrics);
this.log('Features:', answers.features);
- answers.dbpool = answers.dbpool === undefined ? "DBCP" : answers.dbpool;
polygene.name = answers.name;
polygene.packageName = answers.packageName;
polygene.applicationtype = answers.applicationtype;
polygene.features = answers.features;
polygene.indexing = answers.indexing;
polygene.entitystore = answers.entitystore;
- polygene.dbpool = answers.dbpool;
+ polygene.dbpool = answers.dbpool === undefined ? "DBCP" : answers.dbpool;
polygene.metrics = answers.metrics;
polygene.caching = answers.caching;
}.bind(this)
@@ -280,16 +280,16 @@ function assignFunctions(polygene) {
polygene.copyToConfig = function (ctx, from, toName) {
polygene.copyTemplate(ctx,
from,
- 'app/src/main/config/development/' + toName);
+ 'app/src/dist/config/development/' + toName);
polygene.copyTemplate(ctx,
from,
- 'app/src/main/config/qa/' + toName);
+ 'app/src/dist/config/qa/' + toName);
polygene.copyTemplate(ctx,
from,
- 'app/src/main/config/staging/' + toName);
+ 'app/src/dist/config/staging/' + toName);
polygene.copyTemplate(ctx,
from,
- 'app/src/main/config/production/' + toName);
+ 'app/src/dist/config/production/' + toName);
};
polygene.copyTemplate = function (ctx, from, to) {
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties
index 4097894..4c6eb91 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties
@@ -17,7 +17,7 @@
enabled=true
-url=jdbc:postgres://127.0.0.1:5432/<%= polygene.name %>
+url=jdbc:postgresql://127.0.0.1:5432/<%= polygene.name.toLowerCase() %>
driver=org.postgresql.Driver
username=polygene
password=ThisIsGreat!
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
index 4000571..bbcfb28 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js
@@ -22,18 +22,24 @@ module.exports = {
p.copyTemplate(p.ctx,
'InfrastructureLayer/IndexingModule/bootstrap.tmpl',
'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/infrastructure/' + p.indexing + 'IndexingModule.java');
- if( p.indexing === 'SQL' ) {
- p.copyTemplate(p.ctx,
+ if (p.indexing === 'SQL') {
+ p.copyToConfig(
+ p.ctx,
'InfrastructureLayer/IndexingModule/indexing/ds-index-postgresql.properties',
- 'app/src/main/resources/ds-index-postgresql.properties');
+ 'ds-index-postgresql.properties'
+ );
}
- if( p.indexing === 'Solr' ) {
- p.copyTemplate(p.ctx,
+ if (p.indexing === 'Solr') {
+ p.copyToConfig(
+ p.ctx,
'InfrastructureLayer/IndexingModule/indexing/solrconfig.xml',
- 'app/src/main/resources/solrconfig.xml');
- p.copyTemplate(p.ctx,
+ 'solrconfig.xml'
+ );
+ p.copyTemplate(
+ p.ctx,
'InfrastructureLayer/IndexingModule/indexing/solr-schema.xml',
- 'app/src/main/resources/schema.xml');
+ 'schema.xml'
+ );
}
}
};
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties
index 333d6aa..8e696f1 100644
--- a/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties
+++ b/tools/generator-polygene/app/templates/InfrastructureLayer/StorageModule/storage/ds-es-postgresql.properties
@@ -18,7 +18,7 @@
#
#
enabled=true
-url=jdbc:postgres://127.0.0.1:5432/<%= polygene.name %>
+url=jdbc:postgresql://127.0.0.1:5432/<%= polygene.name.toLowerCase() %>
driver=org.postgresql.Driver
username=polygene
password=ThisIsGreat!
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
index 697a2b0..441cdec 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
@@ -53,7 +53,6 @@ if( hasFeature( 'security' ) ) {
}
%> implementation "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion"
implementation "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion"
-
implementation "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion"
implementation "org.apache.polygene.extensions:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion"
implementation "org.apache.polygene.extensions:org.apache.polygene.extension.serialization-javaxjson:$polygeneVersion"
@@ -71,32 +70,30 @@ if( hasFeature( 'envisage' ) ) {
<%
}
if( polygene.entitystore == 'LevelDB' ) {
-%> implementation "org.fusesource.leveldbjni:leveldbjni-all:$levelDbVersion"
+%> runtimeOnly "org.fusesource.leveldbjni:leveldbjni-all:$levelDbVersion"
<%
}
if( polygene.entitystore == 'DerbySQL' ) {
-%> implementation "org.apache.derby:derby:$derbyVersion"
+%> runtimeOnly "org.apache.derby:derby:$derbyVersion"
<%
}
if( polygene.entitystore == 'H2SQL' ) {
-%> implementation "com.h2database:h2:$h2Version"
+%> runtimeOnly "com.h2database:h2:$h2Version"
<%
}
if( polygene.entitystore == 'MySQL' ) {
-%> implementation "mysql:mysql-connector-java:$mysqlVersion"
+%> runtimeOnly "mysql:mysql-connector-java:$mysqlVersion"
<%
}
-if( polygene.entitystore == 'PostgreSQL' ) {
-%> implementation "org.postgresql:postgresql:$postgresVersion"
+if( polygene.entitystore == 'PostgreSQL' || polygene.indexing == 'SQL' ) {
+%> runtimeOnly "org.postgresql:postgresql:$postgresVersion"
<%
}
if( polygene.entitystore == 'SQLite' ) {
-%> implementation "org.xerial:sqlite-jdbc:$sqliteVersion"
+%> runtimeOnly "org.xerial:sqlite-jdbc:$sqliteVersion"
<%
}
-%>
-
- runtimeOnly "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
+%> runtimeOnly "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion"
runtimeOnly "org.apache.johnzon:johnzon-core:$johnzonVersion"
runtimeOnly "org.apache.johnzon:johnzon-mapper:$johnzonVersion"
runtimeOnly "org.apache.geronimo.specs:geronimo-json_1.1_spec:1.0"
@@ -107,22 +104,3 @@ if( polygene.entitystore == 'SQLite' ) {
testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion"
testImplementation "com.github.tdomzal:junit-docker-rule:0.3"
}
-
-
-task createConfigs {
- def config = file("src/main/config")
- outputs.dir config
- doLast {
- config.mkdirs()
- }
-}
-
-distributions {
- main {
- contents {
- from(createConfigs) {
- into "config"
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/8393d863/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
index 60dbb70..6d2a6bf 100644
--- a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
+++ b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl
@@ -44,7 +44,7 @@ if( polygene.entitystore == 'MySQL' ) {
%> mysqlVersion = "6.0.6"
<%
}
-if( polygene.entitystore == 'PostgreSQL' ) {
+if( polygene.entitystore == 'PostgreSQL' || polygene.indexing == 'SQL' ) {
%> postgresVersion = "42.0.0"
<%
}
[43/50] [abbrv] polygene-java git commit: Upgrade ElasticSearch
dependency version to 5.5
Posted by pa...@apache.org.
Upgrade ElasticSearch dependency version to 5.5
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/361f6fe9
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/361f6fe9
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/361f6fe9
Branch: refs/heads/master
Commit: 361f6fe97b34196154f790485ab7af63c5a4d29d
Parents: fc7c432
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 08:56:27 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 08:56:27 2017 +0200
----------------------------------------------------------------------
dependencies.gradle | 6 +++---
.../polygene/index/elasticsearch/ElasticSearchFinder.java | 6 +++---
.../polygene/index/elasticsearch/ElasticSearchIndexer.java | 3 ++-
.../elasticsearch/internal/AbstractElasticSearchSupport.java | 6 ++++--
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index 2cb6388..ef62cf2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -51,7 +51,7 @@ def commonsLangVersion = '3.5'
def commonsValidatorVersion = '1.6'
def derbyVersion = '10.13.1.1'
def ehcacheVersion = '3.3.1'
-def elasticsearchVersion = '5.2.2'
+def elasticsearchVersion = '5.5.0'
def freemarkerVersion = '2.3.26-incubating'
def geodeVersion = '1.1.1'
def groovyVersion = '2.4.10'
@@ -97,8 +97,8 @@ dependencies.libraries << [
elasticsearch : [ "org.elasticsearch:elasticsearch:$elasticsearchVersion",
"org.elasticsearch.client:transport:$elasticsearchVersion",
// Elasticsearch 5.0 do not work with log4j 2.7
- "org.apache.logging.log4j:log4j-api:2.6.2",
- "org.apache.logging.log4j:log4j-core:2.6.2" ],
+ "org.apache.logging.log4j:log4j-api:2.8.2",
+ "org.apache.logging.log4j:log4j-core:2.8.2" ],
freemarker : "org.freemarker:freemarker:$freemarkerVersion",
geode : "org.apache.geode:geode-core:$geodeVersion",
groovy : "org.codehaus.groovy:groovy-all:$groovyVersion",
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
index 18c49eb..502471b 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchFinder.java
@@ -130,7 +130,7 @@ public interface ElasticSearchFinder
SearchResponse response = request.execute().actionGet();
return StreamSupport.stream( response.getHits().spliterator(), false )
- .map( hit -> EntityReference.parseEntityReference( hit.id() ) );
+ .map( hit -> EntityReference.parseEntityReference( hit.getId() ) );
}
@Override
@@ -154,9 +154,9 @@ public interface ElasticSearchFinder
// Execute
SearchResponse response = request.execute().actionGet();
- if( response.getHits().totalHits() == 1 )
+ if( response.getHits().getTotalHits() == 1 )
{
- return EntityReference.parseEntityReference( response.getHits().getAt( 0 ).id() );
+ return EntityReference.parseEntityReference( response.getHits().getAt( 0 ).getId() );
}
return null;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
index 0737f86..99bcdab 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/ElasticSearchIndexer.java
@@ -48,6 +48,7 @@ import org.apache.polygene.spi.entitystore.StateChangeListener;
import org.apache.polygene.spi.serialization.JsonSerializer;
import org.elasticsearch.action.bulk.BulkRequestBuilder;
import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.common.xcontent.XContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -169,7 +170,7 @@ public interface ElasticSearchIndexer extends StateChangeListener
{
bulkBuilder.add( support.client().
prepareIndex( support.index(), support.entitiesType(), identity ).
- setSource( json ) );
+ setSource( json, XContentType.JSON ) );
}
/**
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/361f6fe9/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
index d899958..e623c6e 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/internal/AbstractElasticSearchSupport.java
@@ -19,11 +19,12 @@
*/
package org.apache.polygene.index.elasticsearch.internal;
+import org.apache.polygene.index.elasticsearch.ElasticSearchSupport;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
-import org.apache.polygene.index.elasticsearch.ElasticSearchSupport;
+import org.elasticsearch.common.xcontent.XContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +68,8 @@ public abstract class AbstractElasticSearchSupport
.endObject()
.endObject()
.endObject()
- .string() );
+ .string(),
+ XContentType.JSON);
XContentBuilder mapping = XContentFactory.jsonBuilder()
.startObject()
.startObject( entitiesType() )
[22/50] [abbrv] polygene-java git commit: Fix Exceptions in RDF
Indexing
Posted by pa...@apache.org.
Fix Exceptions in RDF Indexing
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/73fa7bd8
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/73fa7bd8
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/73fa7bd8
Branch: refs/heads/master
Commit: 73fa7bd89b3a8af275041524dfa762fee9554377
Parents: 007d812
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:48:45 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:48:45 2017 +0800
----------------------------------------------------------------------
.../apache/polygene/index/rdf/UnsupportedLanguageException.java | 4 ++--
.../polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java | 1 +
.../index/rdf/assembly/RdfNativeSesameStoreAssembler.java | 1 +
.../index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java | 1 +
.../org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java | 1 +
.../apache/polygene/index/rdf/indexing/RdfIndexerService.java | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
index 3e02eb9..08c0d00 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
@@ -19,10 +19,10 @@
*/
package org.apache.polygene.index.rdf;
+import org.apache.polygene.api.indexing.IndexingException;
import org.openrdf.query.QueryLanguage;
-public class UnsupportedLanguageException
- extends RuntimeException
+public class UnsupportedLanguageException extends IndexingException
{
private QueryLanguage language;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
index ef6f5bd..5299c48 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
@@ -46,6 +46,7 @@ public class RdfMemoryStoreAssembler extends AbstractRdfIndexingAssembler<RdfNat
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( MemoryRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
index 7fb19a9..5014acc 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
@@ -47,6 +47,7 @@ public class RdfNativeSesameStoreAssembler extends AbstractRdfIndexingAssembler<
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( NativeRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
index 1176e16..521476f 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
@@ -47,6 +47,7 @@ public class RdfRdbmsSesameStoreAssembler extends AbstractRdfIndexingAssembler<
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( RdbmsRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
index ad0e599..b33eea9 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
@@ -77,6 +77,7 @@ public interface RdfIndexExporter extends IndexExporter
catch( Exception e )
{
e.printStackTrace();
+ throw new IOException( "Problem writing to RdfWriter", e );
}
finally
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/73fa7bd8/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
index d47a7f7..38f501a 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
@@ -125,7 +125,7 @@ public interface RdfIndexerService extends StateChangeListener
catch( Throwable e )
{
e.printStackTrace();
- //TODO What shall we do with the exception?
+ //TODO What shall we do with the exception? Probably figure out if we can recover, and possibly queue the state changes and retry later.
}
}
[23/50] [abbrv] polygene-java git commit: Fixed that Assmeblers tries
to warn if assemble() method is forgotten.
Posted by pa...@apache.org.
Fixed that Assmeblers tries to warn if assemble() method is forgotten.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/047380a3
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/047380a3
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/047380a3
Branch: refs/heads/master
Commit: 047380a3c36483c73d1c105c5ab465b45656fcea
Parents: 73fa7bd
Author: niclas <ni...@hedhman.org>
Authored: Mon Jul 10 11:32:32 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Mon Jul 10 11:32:32 2017 +0800
----------------------------------------------------------------------
.../polygene/api/query/QueryBuilderFactory.java | 2 +
.../apache/polygene/bootstrap/Assemblers.java | 56 +++++++++++++++++---
.../runtime/unitofwork/ModuleUnitOfWork.java | 3 +-
.../polygene/test/EntityTestAssembler.java | 1 +
.../ehcache/assembly/EhCacheAssembler.java | 1 +
.../memcache/assembly/MemcacheAssembler.java | 1 +
.../assembly/CassandraEntityStoreAssembler.java | 1 +
.../file/assembly/FileEntityStoreAssembler.java | 1 +
.../assembly/GeodeEntityStoreAssembler.java | 1 +
.../assembly/HazelcastEntityStoreAssembler.java | 1 +
.../assembly/JCloudsEntityStoreAssembler.java | 1 +
.../jdbm/assembly/JdbmEntityStoreAssembler.java | 1 +
.../assembly/LevelDBEntityStoreAssembler.java | 1 +
.../assembly/MemoryEntityStoreAssembler.java | 1 +
.../assembly/MongoDBEntityStoreAssembler.java | 1 +
.../PreferencesEntityStoreAssembler.java | 1 +
.../assembly/RedisEntityStoreAssembler.java | 1 +
.../riak/assembly/RiakEntityStoreAssembler.java | 1 +
.../AbstractSQLEntityStoreAssembler.java | 1 +
.../assembly/ESClientIndexQueryAssembler.java | 1 +
.../assembly/ESClusterIndexQueryAssembler.java | 1 +
.../ESFilesystemIndexQueryAssembler.java | 1 +
.../solr/assembly/SolrIndexingAssembler.java | 1 +
.../AbstractSQLIndexQueryAssembler.java | 1 +
.../assembly/CodahaleMetricsAssembler.java | 1 +
.../JavaxJsonSerializationAssembler.java | 1 +
.../JavaxXmlSerializationAssembler.java | 1 +
.../MessagePackSerializationAssembler.java | 1 +
.../library/alarm/AlarmSystemAssembler.java | 1 +
.../fileconfig/FileConfigurationAssembler.java | 1 +
.../library/http/JettyServiceAssembler.java | 1 +
.../library/rest/client/RssReaderTest.java | 52 ++++++++----------
.../library/rest/admin/RestAssembler.java | 1 +
.../assembly/RestletCrudModuleAssembler.java | 1 +
.../shiro/assembly/PasswordDomainAssembler.java | 1 +
.../assembly/PermissionsDomainAssembler.java | 1 +
.../assembly/StandaloneShiroAssembler.java | 1 +
.../shiro/web/assembly/HttpShiroAssembler.java | 1 +
.../sql/liquibase/LiquibaseAssembler.java | 1 +
...bstractPooledDataSourceServiceAssembler.java | 1 +
.../sql/assembly/DataSourceAssembler.java | 1 +
.../sql/assembly/DataSourceJMXAssembler.java | 1 +
.../assembly/ExternalDataSourceAssembler.java | 1 +
.../assembly/PersistingSequencingAssembler.java | 1 +
.../assembly/TransientSequencingAssembler.java | 1 +
.../uid/uuid/assembly/UuidServiceAssembler.java | 1 +
.../uowfile/bootstrap/UoWFileAssembler.java | 1 +
47 files changed, 117 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java b/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
index 19ee958..de1a3a1 100644
--- a/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
+++ b/core/api/src/main/java/org/apache/polygene/api/query/QueryBuilderFactory.java
@@ -19,6 +19,8 @@
*/
package org.apache.polygene.api.query;
+import org.apache.polygene.api.indexing.MissingIndexingSystemException;
+
/**
* This is used to create QueryBuilders.
*
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
----------------------------------------------------------------------
diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
index b24a5e6..7efcd6d 100644
--- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
+++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/Assemblers.java
@@ -117,7 +117,7 @@ public class Assemblers
* Assembler with Visibility adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Visibility<AssemblerType>
+ public static abstract class Visibility<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>
{
private org.apache.polygene.api.common.Visibility visibility = org.apache.polygene.api.common.Visibility.module;
@@ -141,7 +141,7 @@ public class Assemblers
* Assembler with Identity adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Identity<AssemblerType>
+ public static abstract class Identity<AssemblerType> extends AssembleChecker
implements Identifiable<AssemblerType>
{
private String identity;
@@ -171,7 +171,7 @@ public class Assemblers
* Assembler with Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class Config<AssemblerType>
+ public static abstract class Config<AssemblerType> extends AssembleChecker
implements Configurable<AssemblerType>
{
private ModuleAssembly configModule = null;
@@ -210,7 +210,7 @@ public class Assemblers
* Assembler with Visibility and Identity adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityIdentity<AssemblerType>
+ public static abstract class VisibilityIdentity<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Identifiable<AssemblerType>
{
@@ -256,7 +256,7 @@ public class Assemblers
* Assembler with Visibility and Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityConfig<AssemblerType>
+ public static abstract class VisibilityConfig<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Configurable<AssemblerType>
{
@@ -311,7 +311,7 @@ public class Assemblers
* Assembler with Identity and Configuration adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class IdentityConfig<AssemblerType>
+ public static abstract class IdentityConfig<AssemblerType> extends AssembleChecker
implements Identifiable<AssemblerType>,
Configurable<AssemblerType>
{
@@ -372,7 +372,7 @@ public class Assemblers
* Assembler with Visibility, Identity and Configuation adapter.
* @param <AssemblerType> Parameterized type of Assembler
*/
- public static abstract class VisibilityIdentityConfig<AssemblerType>
+ public static abstract class VisibilityIdentityConfig<AssemblerType> extends AssembleChecker
implements Visible<AssemblerType>,
Identifiable<AssemblerType>,
Configurable<AssemblerType>
@@ -445,4 +445,46 @@ public class Assemblers
}
}
+ public static abstract class AssembleChecker
+ implements Assembler
+ {
+ private boolean assembled = false;
+
+ @Override
+ public void assemble( ModuleAssembly module )
+ throws AssemblyException
+ {
+ assembled = true;
+ }
+
+ @Override
+ protected void finalize()
+ throws Throwable
+ {
+ super.finalize();
+ if( !assembled )
+ {
+ System.err.println( "WARNING!!!!!" );
+ System.err.println( "############################################################################" );
+ System.err.println( "##" );
+ System.err.println( "## The " + getClass().getName() + " assembler was not assembled." );
+ System.err.println( "##" );
+ System.err.println( "## Expect that some functionality to be missing or incorrect." );
+ System.err.println( "##" );
+ if( getClass().getName().startsWith( "org.apache.polygene" ))
+ {
+ System.err.println( "## When instantiating a provided Assembler, you must call the assemble(module)" );
+ System.err.println( "## method after setting the options. This was not done." );
+ }
+ else
+ {
+ System.err.println( "## When overriding any helper class in org.apache.polygene.bootstrap.Assemblers" );
+ System.err.println( "## you must call super.assemble(module) in the assmeble(ModuleAssembly module)" );
+ System.err.println( "## method. This was not done, OR that you forgot to call assemble() method " );
+ System.err.println( "## after instantiating and setting the options." );
+ }
+ System.err.println( "############################################################################" );
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
index 0cf26f0..f72cb37 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/unitofwork/ModuleUnitOfWork.java
@@ -547,7 +547,8 @@ public class ModuleUnitOfWork
return ( (EntityInstance) compositeInstanceOf( (Composite) entity ) ).entityState();
}
- private static class UoWQuerySource implements QuerySource
+ private static class UoWQuerySource
+ implements QuerySource
{
private final ModuleUnitOfWork moduleUnitOfWork;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java b/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
index 36827b8..4dbe625 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/EntityTestAssembler.java
@@ -42,6 +42,7 @@ public class EntityTestAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
index 8a4d4f8..e99a379 100644
--- a/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
+++ b/extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/assembly/EhCacheAssembler.java
@@ -31,6 +31,7 @@ public class EhCacheAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( EhCachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
index 92a76db..20886ec 100644
--- a/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
+++ b/extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/assembly/MemcacheAssembler.java
@@ -34,6 +34,7 @@ public class MemcacheAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemcachePoolService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
index ab6193f..51f726b 100644
--- a/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
+++ b/extensions/entitystore-cassandra/src/main/java/org/apache/polygene/entitystore/cassandra/assembly/CassandraEntityStoreAssembler.java
@@ -30,6 +30,7 @@ public class CassandraEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( CassandraEntityStoreService.class )
.visibleIn( visibility() )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
index 13e1ad8..40fdf35 100644
--- a/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
+++ b/extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/assembly/FileEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class FileEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( FileEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java b/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
index fbb68de..8bc98c9 100644
--- a/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
+++ b/extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/assembly/GeodeEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class GeodeEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( GeodeEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java b/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
index ae5ad69..be0c8a8 100644
--- a/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
+++ b/extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/assembly/HazelcastEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class HazelcastEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( HazelcastEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java b/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
index d586f1b..aba1e32 100644
--- a/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
+++ b/extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/assembly/JCloudsEntityStoreAssembler.java
@@ -32,6 +32,7 @@ public class JCloudsEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( JCloudsEntityStoreService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java b/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
index 175b6db..f48d3cb 100644
--- a/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
+++ b/extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/assembly/JdbmEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class JdbmEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( JdbmEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
index 4f8f2b7..1a8a26a 100644
--- a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
+++ b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/assembly/LevelDBEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class LevelDBEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( LevelDBEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java b/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
index b593442..6b11a85 100644
--- a/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
+++ b/extensions/entitystore-memory/src/main/java/org/apache/polygene/entitystore/memory/assembly/MemoryEntityStoreAssembler.java
@@ -33,6 +33,7 @@ public class MemoryEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MemoryEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java b/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
index c3d40ec..f212a8d 100644
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/assembly/MongoDBEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class MongoDBEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( MongoDBEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java b/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
index f3b0de5..4f6725a 100644
--- a/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
+++ b/extensions/entitystore-preferences/src/main/java/org/apache/polygene/entitystore/preferences/assembly/PreferencesEntityStoreAssembler.java
@@ -31,6 +31,7 @@ public class PreferencesEntityStoreAssembler extends Assemblers.VisibilityIdenti
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
String applicationName = module.layer().application().name();
Preferences root = Preferences.userRoot();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java b/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
index 4f521a2..7c1ebca 100644
--- a/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
+++ b/extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/assembly/RedisEntityStoreAssembler.java
@@ -34,6 +34,7 @@ public class RedisEntityStoreAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( RedisEntityStoreService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java b/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
index ce538f6..9c67e31 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/polygene/entitystore/riak/assembly/RiakEntityStoreAssembler.java
@@ -33,6 +33,7 @@ public class RiakEntityStoreAssembler
@Override
public void assemble(ModuleAssembly module)
{
+ super.assemble( module );
ServiceDeclaration service = module.services( RiakEntityStoreService.class ).
withMixins( RiakEntityStoreMixin.class ).
visibleIn( visibility() );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java b/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
index c25a3cd..0f86490 100644
--- a/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
+++ b/extensions/entitystore-sql/src/main/java/org/apache/polygene/entitystore/sql/assembly/AbstractSQLEntityStoreAssembler.java
@@ -44,6 +44,7 @@ public abstract class AbstractSQLEntityStoreAssembler<AssemblerType>
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
SQLDialect dialect = getSQLDialect();
if( dialect == null )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
index 1a8a3a2..7b118d4 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClientIndexQueryAssembler.java
@@ -36,6 +36,7 @@ public class ESClientIndexQueryAssembler
@Override
public void assemble( final ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESClientIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
index 9056cd3..2158059 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESClusterIndexQueryAssembler.java
@@ -30,6 +30,7 @@ public class ESClusterIndexQueryAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESClusterIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
index 1dfb9bb..d401321 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/polygene/index/elasticsearch/assembly/ESFilesystemIndexQueryAssembler.java
@@ -30,6 +30,7 @@ public class ESFilesystemIndexQueryAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( ESFilesystemIndexQueryService.class )
.taggedWith( "elasticsearch", "query", "indexing" )
.identifiedBy( identity() )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
index 4932cdc..ab0e3c8 100644
--- a/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
+++ b/extensions/indexing-solr/src/main/java/org/apache/polygene/index/solr/assembly/SolrIndexingAssembler.java
@@ -31,6 +31,7 @@ public class SolrIndexingAssembler extends Assemblers.VisibilityIdentityConfig<S
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( EmbeddedSolrService.class ).identifiedBy( "solr" ).instantiateOnStartup();
module.services( SolrQueryService.class )
.taggedWith( "solr", "search", "indexing", "query" )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
index b5e861c..6c931be 100644
--- a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/assembly/AbstractSQLIndexQueryAssembler.java
@@ -62,6 +62,7 @@ public abstract class AbstractSQLIndexQueryAssembler<AssemblerType> extends Asse
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
try
{
SQLVendor sqlVendor = getSQLVendor();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java b/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
index 0281d12..f2bd5d6 100644
--- a/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
+++ b/extensions/metrics-codahale/src/main/java/org/apache/polygene/metrics/codahale/assembly/CodahaleMetricsAssembler.java
@@ -108,6 +108,7 @@ public class CodahaleMetricsAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service =
module.services( CodahaleMetricsProvider.class )
.setMetaInfo( declaration )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
index 10a8622..0bd397c 100644
--- a/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
+++ b/extensions/serialization-javaxjson/src/main/java/org/apache/polygene/serialization/javaxjson/assembly/JavaxJsonSerializationAssembler.java
@@ -45,6 +45,7 @@ public class JavaxJsonSerializationAssembler extends Assemblers.VisibilityIdenti
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( JavaxJsonSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
index e6a69f5..2385715 100644
--- a/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
+++ b/extensions/serialization-javaxxml/src/main/java/org/apache/polygene/serialization/javaxxml/assembly/JavaxXmlSerializationAssembler.java
@@ -45,6 +45,7 @@ public class JavaxXmlSerializationAssembler extends Assemblers.VisibilityIdentit
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( JavaxXmlSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
index 7f87458..a262e80 100644
--- a/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
+++ b/extensions/serialization-messagepack/src/main/java/org/apache/polygene/serialization/messagepack/assembly/MessagePackSerializationAssembler.java
@@ -41,6 +41,7 @@ public class MessagePackSerializationAssembler extends Assemblers.VisibilityIden
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module.services( MessagePackSerialization.class )
.withTypes( Serialization.class,
Serializer.class, Deserializer.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
index 73d407b..405ca99 100644
--- a/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
+++ b/libraries/alarm/src/main/java/org/apache/polygene/library/alarm/AlarmSystemAssembler.java
@@ -29,6 +29,7 @@ public class AlarmSystemAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration alarmSystem = module.services( AlarmSystemService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
index 6270502..bdc8d89 100644
--- a/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
+++ b/libraries/fileconfig/src/main/java/org/apache/polygene/library/fileconfig/FileConfigurationAssembler.java
@@ -40,6 +40,7 @@ public class FileConfigurationAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( FileConfigurationService.class ).visibleIn( visibility() );
if( hasIdentity() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
index d9103ce..d7ebf49 100644
--- a/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
+++ b/libraries/http/src/main/java/org/apache/polygene/library/http/JettyServiceAssembler.java
@@ -54,6 +54,7 @@ public class JettyServiceAssembler
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( httpService() ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
index da9c070..a1fb7a0 100644
--- a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/RssReaderTest.java
@@ -33,15 +33,12 @@ import org.apache.polygene.library.rest.client.api.ContextResourceClient;
import org.apache.polygene.library.rest.client.api.ContextResourceClientFactory;
import org.apache.polygene.library.rest.client.api.ErrorHandler;
import org.apache.polygene.library.rest.client.api.HandlerCommand;
-import org.apache.polygene.library.rest.client.spi.ResponseHandler;
-import org.apache.polygene.library.rest.client.spi.ResponseReader;
import org.apache.polygene.library.rest.client.spi.ResultHandler;
import org.apache.polygene.library.rest.common.ValueAssembler;
import org.apache.polygene.test.AbstractPolygeneTest;
import org.junit.BeforeClass;
import org.junit.Test;
import org.restlet.Client;
-import org.restlet.Response;
import org.restlet.data.Protocol;
import org.restlet.data.Reference;
import org.restlet.resource.ResourceException;
@@ -67,6 +64,7 @@ public class RssReaderTest
assumeConnectivity( "github.com", 443 );
}
+ @SuppressWarnings( "FieldCanBeLocal" )
private ContextResourceClient crc;
@Override
@@ -84,42 +82,34 @@ public class RssReaderTest
public void testReadRssFeed()
{
Client client = new Client( Protocol.HTTPS );
- Reference ref = new Reference( "https://github.com/Qi4j/qi4j-sdk/commits/develop.atom" );
+ Reference ref = new Reference( "https://github.com/Apache/polygene-java/commits/develop.atom" );
ContextResourceClientFactory contextResourceClientFactory = objectFactory.newObject( ContextResourceClientFactory.class, client );
- contextResourceClientFactory.registerResponseReader( new ResponseReader()
- {
- @Override
- public Object readResponse( Response response, Class<?> resultType )
- throws ResourceException
+ contextResourceClientFactory.registerResponseReader( ( response, resultType ) -> {
+ if( resultType.equals( Document.class ) )
{
- if( resultType.equals( Document.class ) )
+ try
{
- try
- {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware( false );
- return documentBuilderFactory.newDocumentBuilder().parse( response.getEntity().getStream() );
- }
- catch( Exception e )
- {
- throw new ResourceException( e );
- }
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware( false );
+ return documentBuilderFactory.newDocumentBuilder().parse( response.getEntity().getStream() );
+ }
+ catch( Exception e )
+ {
+ throw new ResourceException( e );
}
-
- return null;
}
+
+ return null;
} );
- contextResourceClientFactory.setErrorHandler( new ErrorHandler().onError( ErrorHandler.RECOVERABLE_ERROR, new ResponseHandler()
- {
- @Override
- public HandlerCommand handleResponse( Response response, ContextResourceClient client )
- {
- System.out.println( ">> REFRESH on recoverable error: " + response.getStatus() );
- return refresh();
- }
- } ) );
+ contextResourceClientFactory.setErrorHandler(
+ new ErrorHandler()
+ .onError( ErrorHandler.RECOVERABLE_ERROR,
+ ( response, client1 ) -> {
+ System.out.println( ">> REFRESH on recoverable error: " + response.getStatus() );
+ return refresh();
+ } ) );
crc = contextResourceClientFactory.newClient( ref );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
index 9641806..0bd9782 100644
--- a/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
+++ b/libraries/rest/src/main/java/org/apache/polygene/library/rest/admin/RestAssembler.java
@@ -29,6 +29,7 @@ public class RestAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.objects( RestApplication.class ).visibleIn( visibility() );
module.objects( PolygeneFinder.class,
EntitiesResource.class,
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
index 490804b..f6c07e0 100644
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
+++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
@@ -52,6 +52,7 @@ public class RestletCrudModuleAssembler extends Assemblers.VisibilityIdentity<Re
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration declaration = module
.addServices( repositoryType )
.visibleIn( Visibility.application )
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
index df2e3e4..f9c4a2d 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PasswordDomainAssembler.java
@@ -32,6 +32,7 @@ public class PasswordDomainAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.entities( PasswordSecurable.class ).visibleIn( visibility() );
ServiceDeclaration service = module.services( PasswordRealmService.class ).
instantiateOnStartup().
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
index 1848a69..6609085 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/PermissionsDomainAssembler.java
@@ -32,6 +32,7 @@ public class PermissionsDomainAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.entities( Role.class, RoleAssignment.class, RoleAssignee.class ).
visibleIn( visibility() );
module.services( RoleFactory.class ).
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
index 25ca7ba..9edf580 100644
--- a/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
+++ b/libraries/shiro-core/src/main/java/org/apache/polygene/library/shiro/assembly/StandaloneShiroAssembler.java
@@ -31,6 +31,7 @@ public class StandaloneShiroAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( IniSecurityManagerService.class ).
visibleIn( visibility() ).
instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
index 01630a0..8037332 100644
--- a/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
+++ b/libraries/shiro-web/src/main/java/org/apache/polygene/library/shiro/web/assembly/HttpShiroAssembler.java
@@ -40,6 +40,7 @@ public class HttpShiroAssembler extends Assemblers.Config<HttpShiroAssembler>
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
addContextListeners(
listen().with( EnvironmentLoaderService.class ) )
.to( module );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
index d29cf8d..59f1aba 100644
--- a/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
+++ b/libraries/sql-liquibase/src/main/java/org/apache/polygene/library/sql/liquibase/LiquibaseAssembler.java
@@ -31,6 +31,7 @@ public class LiquibaseAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
ServiceDeclaration service = module.services( LiquibaseService.class ).visibleIn( visibility() );
if( applyChangelogOnStartup )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
index 49ed1fe..360e34e 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/AbstractPooledDataSourceServiceAssembler.java
@@ -32,6 +32,7 @@ public abstract class AbstractPooledDataSourceServiceAssembler<AssemblerType>
@Override
public final void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.values( DataSourceConfiguration.class ).visibleIn( Visibility.module );
if( hasConfig() )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
index 1618cc0..adea163 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceAssembler.java
@@ -68,6 +68,7 @@ public class DataSourceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.importedServices( DataSource.class ).
importedBy( ServiceInstanceImporter.class ).
setMetaInfo( StringIdentity.identityOf( dataSourceServiceId ) ).
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
index e65e1e7..ff6a004 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/DataSourceJMXAssembler.java
@@ -29,6 +29,7 @@ public class DataSourceJMXAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( DataSourceConfigurationManagerService.class ).visibleIn( visibility() ).instantiateOnStartup();
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
index 2e833bb..462dee3 100644
--- a/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
+++ b/libraries/sql/src/main/java/org/apache/polygene/library/sql/assembly/ExternalDataSourceAssembler.java
@@ -63,6 +63,7 @@ public class ExternalDataSourceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
if( circuitBreaker != null )
{
externalDataSource = DataSources.wrapWithCircuitBreaker( StringIdentity.identityOf( identity() ), externalDataSource, circuitBreaker );
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
index 1a8038c..ebebe0b 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/PersistingSequencingAssembler.java
@@ -31,6 +31,7 @@ public class PersistingSequencingAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( PersistingSequencingService.class ).visibleIn( visibility() );
module.entities( SequenceEntity.class ).visibleIn( Visibility.module );
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
index a53b9a3..d32f78b 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/sequence/assembly/TransientSequencingAssembler.java
@@ -29,6 +29,7 @@ public class TransientSequencingAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( TransientSequencingService.class ).visibleIn( visibility() );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java b/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
index 489650d..b32d642 100644
--- a/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
+++ b/libraries/uid/src/main/java/org/apache/polygene/library/uid/uuid/assembly/UuidServiceAssembler.java
@@ -29,6 +29,7 @@ public class UuidServiceAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( UuidServiceComposite.class ).visibleIn( visibility() );
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/047380a3/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java b/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
index ab98a18..a85e757 100644
--- a/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
+++ b/libraries/uowfile/src/main/java/org/apache/polygene/library/uowfile/bootstrap/UoWFileAssembler.java
@@ -41,6 +41,7 @@ public class UoWFileAssembler
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( UoWFileFactory.class ).visibleIn( visibility() );
}
}
[27/50] [abbrv] polygene-java git commit: Added IndexingException,
since no organized exception hierarchy exists for that.
Posted by pa...@apache.org.
Added IndexingException, since no organized exception hierarchy exists for that.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2c3be201
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2c3be201
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2c3be201
Branch: refs/heads/master
Commit: 2c3be20118a1f433e9c516a753d8ba93bb32250c
Parents: af87b22
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:37:44 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:14 2017 +0200
----------------------------------------------------------------------
.../polygene/spi/query/IndexingException.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2c3be201/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
new file mode 100644
index 0000000..6fc8124
--- /dev/null
+++ b/core/spi/src/main/java/org/apache/polygene/spi/query/IndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.spi.query;
+
+/**
+ * This is the exception for Indexing problems. Subtypes should be created for specific problems.
+ *
+ */
+public abstract class IndexingException extends RuntimeException
+{
+ public IndexingException( String message )
+ {
+ super( message );
+ }
+ public IndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
[18/50] [abbrv] polygene-java git commit: SqlIndexingException
Posted by pa...@apache.org.
SqlIndexingException
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/c7d66e17
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c7d66e17
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c7d66e17
Branch: refs/heads/master
Commit: c7d66e177a7cfc2d79652da03e943af92b022105
Parents: 9778ca0
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:38:06 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 12:38:06 2017 +0800
----------------------------------------------------------------------
.../support/skeletons/SqlIndexingException.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/c7d66e17/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
new file mode 100644
index 0000000..cfa3b80
--- /dev/null
+++ b/extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SqlIndexingException.java
@@ -0,0 +1,17 @@
+package org.apache.polygene.index.sql.support.skeletons;
+
+import org.apache.polygene.spi.query.IndexingException;
+
+@SuppressWarnings( "WeakerAccess" )
+public class SqlIndexingException extends IndexingException
+{
+ public SqlIndexingException( String message )
+ {
+ super( message );
+ }
+
+ public SqlIndexingException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
[32/50] [abbrv] polygene-java git commit: Fix Exceptions in RDF
Indexing
Posted by pa...@apache.org.
Fix Exceptions in RDF Indexing
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/d346b7d3
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/d346b7d3
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/d346b7d3
Branch: refs/heads/master
Commit: d346b7d3079c19dc0e6a64bbba605724cc77038b
Parents: 918d7b6
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 12:48:45 2017 +0800
Committer: Paul Merlin <pa...@apache.org>
Committed: Thu Jul 13 17:13:50 2017 +0200
----------------------------------------------------------------------
.../apache/polygene/index/rdf/UnsupportedLanguageException.java | 4 ++--
.../polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java | 1 +
.../index/rdf/assembly/RdfNativeSesameStoreAssembler.java | 1 +
.../index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java | 1 +
.../org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java | 1 +
.../apache/polygene/index/rdf/indexing/RdfIndexerService.java | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
index 3e02eb9..08c0d00 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/UnsupportedLanguageException.java
@@ -19,10 +19,10 @@
*/
package org.apache.polygene.index.rdf;
+import org.apache.polygene.api.indexing.IndexingException;
import org.openrdf.query.QueryLanguage;
-public class UnsupportedLanguageException
- extends RuntimeException
+public class UnsupportedLanguageException extends IndexingException
{
private QueryLanguage language;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
index ef6f5bd..5299c48 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfMemoryStoreAssembler.java
@@ -46,6 +46,7 @@ public class RdfMemoryStoreAssembler extends AbstractRdfIndexingAssembler<RdfNat
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( MemoryRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
index 7fb19a9..5014acc 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfNativeSesameStoreAssembler.java
@@ -47,6 +47,7 @@ public class RdfNativeSesameStoreAssembler extends AbstractRdfIndexingAssembler<
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( NativeRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
index 1176e16..521476f 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/assembly/RdfRdbmsSesameStoreAssembler.java
@@ -47,6 +47,7 @@ public class RdfRdbmsSesameStoreAssembler extends AbstractRdfIndexingAssembler<
@Override
public void assemble( ModuleAssembly module )
{
+ super.assemble( module );
module.services( RdbmsRepositoryService.class )
.visibleIn( repositoryVisibility )
.instantiateOnStartup();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
index ad0e599..b33eea9 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexExporter.java
@@ -77,6 +77,7 @@ public interface RdfIndexExporter extends IndexExporter
catch( Exception e )
{
e.printStackTrace();
+ throw new IOException( "Problem writing to RdfWriter", e );
}
finally
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/d346b7d3/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
index d47a7f7..38f501a 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/polygene/index/rdf/indexing/RdfIndexerService.java
@@ -125,7 +125,7 @@ public interface RdfIndexerService extends StateChangeListener
catch( Throwable e )
{
e.printStackTrace();
- //TODO What shall we do with the exception?
+ //TODO What shall we do with the exception? Probably figure out if we can recover, and possibly queue the state changes and retry later.
}
}
[02/50] [abbrv] polygene-java git commit: Constraint check is
incorrect. Was introduced when better reporting was attempted.
Posted by pa...@apache.org.
Constraint check is incorrect. Was introduced when better reporting was attempted.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/ed6ae814
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/ed6ae814
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/ed6ae814
Branch: refs/heads/master
Commit: ed6ae8140f51f12f41946d09b561cac973e1260d
Parents: d22dc29
Author: niclas <ni...@hedhman.org>
Authored: Fri Jun 30 16:03:23 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Jun 30 16:03:23 2017 +0800
----------------------------------------------------------------------
.../apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/ed6ae814/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
index cb1c751..7f69916 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java
@@ -596,8 +596,7 @@ public abstract class CompositeAssemblyImpl
// No implementation found!
// Check if if it's a composite constraints
- if( Arrays.stream( annotationType.getAnnotations() )
- .anyMatch( typeHasAnnotation( ConstraintDeclaration.class ) ) )
+ if( typeHasAnnotation( ConstraintDeclaration.class ).test( constraintAnnotation ) )
{
ValueConstraintsModel valueConstraintsModel = constraintsFor(
Arrays.stream( annotationType.getAnnotations() ),
[14/50] [abbrv] polygene-java git commit: Maybe more generic form of
RAT exclusion.
Posted by pa...@apache.org.
Maybe more generic form of RAT exclusion.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/f8380359
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/f8380359
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/f8380359
Branch: refs/heads/master
Commit: f8380359bfe3a82ee07894f40cedac0a0d497981
Parents: 0665d56
Author: niclas <ni...@hedhman.org>
Authored: Sun Jul 9 11:05:30 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Sun Jul 9 11:05:30 2017 +0800
----------------------------------------------------------------------
.../gradle/structure/distributions/DistributionsPlugin.groovy | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f8380359/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
index 1fa7936..bc6e796 100644
--- a/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/polygene/gradle/structure/distributions/DistributionsPlugin.groovy
@@ -166,8 +166,7 @@ class DistributionsPlugin implements Plugin<Project>
spec.exclude '**/.nb-gradle*' // Netbeans files
// Polygene Generator files
- spec.exclude '**/customUnixStartScript.txt'
- spec.exclude '**/customWindowsStartScript.txt'
+ spec.exclude 'tools/generator-polygene/app/templates/**/*.txt'
spec.into '.'
}
[48/50] [abbrv] polygene-java git commit: Artificially remove
indexing-sql and generator-polygene from the release
Posted by pa...@apache.org.
Artificially remove indexing-sql and generator-polygene from the release
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/357eb4e7
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/357eb4e7
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/357eb4e7
Branch: refs/heads/develop
Commit: 357eb4e74d019b00a83acc4b67112eb652b4c5de
Parents: ae9506a
Author: Paul Merlin <pa...@apache.org>
Authored: Mon Jul 17 13:51:30 2017 +0200
Committer: Paul Merlin <pa...@apache.org>
Committed: Mon Jul 17 13:51:30 2017 +0200
----------------------------------------------------------------------
extensions/indexing-sql/dev-status.xml | 6 +++---
tools/generator-polygene/dev-status.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/357eb4e7/extensions/indexing-sql/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/indexing-sql/dev-status.xml b/extensions/indexing-sql/dev-status.xml
index 762e250..71f671f 100644
--- a/extensions/indexing-sql/dev-status.xml
+++ b/extensions/indexing-sql/dev-status.xml
@@ -24,13 +24,13 @@
http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
- <codebase>stable</codebase>
+ <codebase>none</codebase>
<!-- none, brief, good, complete -->
- <documentation>brief</documentation>
+ <documentation>none</documentation>
<!-- none, some, good, complete -->
- <unittests>good</unittests>
+ <unittests>none</unittests>
</status>
<licenses>
<license>ALv2</license>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/357eb4e7/tools/generator-polygene/dev-status.xml
----------------------------------------------------------------------
diff --git a/tools/generator-polygene/dev-status.xml b/tools/generator-polygene/dev-status.xml
index dc6c0e6..0928c46 100644
--- a/tools/generator-polygene/dev-status.xml
+++ b/tools/generator-polygene/dev-status.xml
@@ -24,13 +24,13 @@
http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
<status>
<!--none,early,beta,stable,mature-->
- <codebase>stable</codebase>
+ <codebase>none</codebase>
<!-- none, brief, good, complete -->
- <documentation>good</documentation>
+ <documentation>none</documentation>
<!-- none, some, good, complete -->
- <unittests>complete</unittests>
+ <unittests>none</unittests>
</status>
<licenses>