You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2018/04/13 00:38:32 UTC
[1/4] polygene-java git commit: POLYGENE-298 - Removed
library-restlet. Formatting in the other rest libraries
Repository: polygene-java
Updated Branches:
refs/heads/develop 4fb01aa37 -> 1adfa5732
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/NotPresentException.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/NotPresentException.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/NotPresentException.java
deleted file mode 100644
index 627e346..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/NotPresentException.java
+++ /dev/null
@@ -1,25 +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.resource;
-
-public class NotPresentException extends RuntimeException
-{
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/Parameterizer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/Parameterizer.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/Parameterizer.java
deleted file mode 100644
index a10ba88..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/Parameterizer.java
+++ /dev/null
@@ -1,25 +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.resource;
-
-public interface Parameterizer
-{
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceFactory.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceFactory.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceFactory.java
deleted file mode 100644
index 22c2d24..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ResourceFactory.java
+++ /dev/null
@@ -1,31 +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.resource;
-
-import org.apache.polygene.api.identity.HasIdentity;
-import org.restlet.Context;
-import org.restlet.Request;
-import org.restlet.Response;
-
-public interface ResourceFactory<K extends HasIdentity, T extends ServerResource<K>>
-{
- T create( Class<T> resourceType, Request request, Response response, Context context );
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ServerResource.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ServerResource.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ServerResource.java
deleted file mode 100644
index 14d0697..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/ServerResource.java
+++ /dev/null
@@ -1,109 +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.resource;
-
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.identity.Identifiable;
-import org.apache.polygene.api.identity.Identity;
-import org.apache.polygene.api.injection.scope.Service;
-import org.apache.polygene.api.injection.scope.This;
-import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.property.Property;
-import org.apache.polygene.library.restlet.RestForm;
-import org.apache.polygene.library.restlet.RestLink;
-import org.apache.polygene.library.restlet.identity.IdentityManager;
-import org.restlet.Context;
-import org.restlet.Request;
-import org.restlet.Response;
-import org.restlet.routing.Router;
-
-@Mixins( { ServerResource.NotPresent.class, ServerResource.IdentityMixin.class } )
-public interface ServerResource<T extends HasIdentity> extends Identifiable
-{
- T get();
-
- void put( T value );
-
- void delete();
-
- RestLink post( RestForm form );
-
- interface Parameters<T>
- {
- @Optional
- Property<String> id();
-
- Property<Class<T>> entityType();
-
- Property<Request> request();
-
- Property<Response> response();
-
- Property<Context> context();
-
- Property<Router> router();
- }
-
- abstract class IdentityMixin<T extends HasIdentity>
- implements ServerResource<T>
- {
- @This
- private Parameters<T> parameters;
-
- @Service
- private IdentityManager identityManager;
-
- @Override
- public Identity identity()
- {
- return identityManager.generate( parameters.entityType().get(), parameters.id().get() );
- }
- }
-
- abstract class NotPresent
- implements ServerResource
- {
- @Override
- public HasIdentity get()
- {
- throw new NotPresentException();
- }
-
- @Override
- public void put( HasIdentity value )
- {
- throw new NotPresentException();
- }
-
- @Override
- public void delete()
- {
- throw new NotPresentException();
- }
-
- @Override
- public RestLink post( RestForm form )
- {
- throw new NotPresentException();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/FormRepresentation.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/FormRepresentation.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/FormRepresentation.java
deleted file mode 100644
index fbb9a34..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/FormRepresentation.java
+++ /dev/null
@@ -1,150 +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.serialization;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.function.Function;
-import org.apache.polygene.api.association.AssociationStateHolder;
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.injection.scope.Uses;
-import org.apache.polygene.api.property.PropertyDescriptor;
-import org.apache.polygene.api.value.ValueBuilder;
-import org.apache.polygene.api.value.ValueBuilderFactory;
-import org.apache.polygene.api.value.ValueComposite;
-import org.apache.polygene.api.value.ValueDescriptor;
-import org.apache.polygene.spi.PolygeneSPI;
-import org.restlet.data.Form;
-import org.restlet.data.MediaType;
-import org.restlet.representation.OutputRepresentation;
-import org.restlet.representation.Representation;
-
-/**
- * Representation based of Polygene ValueComposites. It can serialize and deserialize
- * automatically in JSON only.<br>
- * <br>
- */
-public class FormRepresentation<T> extends OutputRepresentation
-{
- @Structure
- private PolygeneSPI spi;
-
- @Structure
- private ValueBuilderFactory vbf;
-
- /**
- * The (parsed) object to format.
- */
- @Optional
- private volatile T object;
-
- /**
- * The object class to instantiate.
- */
- @Optional
- @Uses
- private volatile Class<T> objectClass;
-
- /**
- * The representation to parse.
- */
- @Optional
- @Uses
- private volatile Representation representation;
-
- public FormRepresentation()
- {
- super( MediaType.APPLICATION_WWW_FORM );
- }
-
- private T createObject()
- {
- //noinspection MismatchedQueryAndUpdateOfCollection
- final Form form = new Form( representation );
- ValueBuilder<T> builder = this.vbf.newValueBuilderWithState(
- objectClass,
- descriptor -> form.getFirstValue( descriptor.qualifiedName().name() ),
- descriptor -> null,
- descriptor -> null,
- descriptor -> null
- );
- return builder.newInstance();
- }
-
- /**
- * Returns the wrapped object, deserializing the representation with Polygene
- * if necessary.
- *
- * @return The wrapped object.
- *
- * @throws IOException
- */
- public T getObject()
- throws IOException
- {
- if( object == null )
- {
- object = createObject();
- }
- return object;
- }
-
- /**
- * Returns the object class to instantiate.
- *
- * @return The object class to instantiate.
- */
- public Class<T> getObjectClass()
- {
- return objectClass;
- }
-
- @Override
- public void write( OutputStream outputStream )
- throws IOException
- {
- if( representation != null )
- {
- representation.write( outputStream );
- }
- else if( object != null )
- {
- AssociationStateHolder state = spi.stateOf( (ValueComposite) object );
- ValueDescriptor descriptor = (ValueDescriptor) spi.modelDescriptorFor( object );
- descriptor.state().properties().forEach( property -> {
- String name = property.qualifiedName().name();
- String value = state.propertyFor( property.accessor() ).get().toString();
- try
- {
- outputStream.write( name.getBytes( "UTF-8" ) );
- outputStream.write( "=".getBytes( "UTF-8" ) );
- outputStream.write( value.getBytes( "UTF-8" ) );
- outputStream.write( '\n' );
- }
- catch( IOException e )
- {
- // TODO; not sure what could happen here.
- }
- } );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 01947cf..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/JsonRepresentation.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.restlet.serialization;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-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;
-import org.restlet.engine.application.StatusInfo;
-import org.restlet.representation.OutputRepresentation;
-import org.restlet.representation.Representation;
-
-/**
- * Representation based of Polygene ValueComposites. It can serialize and deserialize
- * automatically in JSON only.<br>
- * <br>
- */
-public class JsonRepresentation<T> extends OutputRepresentation
-{
-
- @Structure
- private PolygeneSPI spi;
-
- @Service
- private Serialization stateSerialization;
-
- @Structure
- private ModuleDescriptor module;
-
- /**
- * The (parsed) object to format.
- */
- @Optional
- @Uses
- private volatile T object;
-
- /**
- * The object class to instantiate.
- */
- @Optional
- @Uses
- private volatile Class<T> objectClass;
-
- /**
- * The representation to parse.
- */
- @Optional
- @Uses
- private volatile Representation representation;
-
- public JsonRepresentation()
- {
- super( MediaType.APPLICATION_JSON );
- }
-
- /**
- * Returns the wrapped object, deserializing the representation with Polygene
- * if necessary.
- *
- * @return The wrapped object.
- *
- * @throws IOException if there is an underlying I/O problem.
- */
- public T getObject()
- throws IOException
- {
- T result = null;
-
- if( this.object != null )
- {
- result = this.object;
- }
- else if( this.representation != null )
- {
- result = stateSerialization.deserialize( module, objectClass,
- new InputStreamReader( this.representation.getStream() ) );
- }
- return result;
- }
-
- /**
- * Returns the object class to instantiate.
- *
- * @return The object class to instantiate.
- */
- public Class<T> getObjectClass()
- {
- return objectClass;
- }
-
- @Override
- public void write( OutputStream outputStream )
- throws IOException
- {
- if( representation != null )
- {
- representation.write( outputStream );
- }
- else if( object instanceof StatusInfo )
- {
- outputStream.write(((StatusInfo) object).getReasonPhrase().getBytes());
- }
- else if( object != null )
- {
- stateSerialization.serialize( Serializer.Options.NO_TYPE_INFO, outputStream, object );
- outputStream.write( '\n' );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/PolygeneConverter.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/PolygeneConverter.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/PolygeneConverter.java
deleted file mode 100644
index 5f88257..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/serialization/PolygeneConverter.java
+++ /dev/null
@@ -1,263 +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.serialization;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.polygene.api.object.ObjectFactory;
-import org.restlet.data.MediaType;
-import org.restlet.data.Preference;
-import org.restlet.engine.converter.ConverterHelper;
-import org.restlet.engine.resource.VariantInfo;
-import org.restlet.representation.Representation;
-import org.restlet.representation.Variant;
-import org.restlet.resource.Resource;
-
-/**
- * Converter between Apache Polygene and JSON.
- */
-public class PolygeneConverter extends ConverterHelper
-{
- /**
- * Variant with media type application/json.
- */
- private static final VariantInfo VARIANT_JSON = new VariantInfo( MediaType.APPLICATION_JSON );
- private static final VariantInfo VARIANT_WWW_FORM_URLENCODED = new VariantInfo( MediaType.APPLICATION_WWW_FORM );
-
- private final ObjectFactory objectFactory;
-
- public PolygeneConverter( ObjectFactory objectFactory )
- {
- this.objectFactory = objectFactory;
- }
-
- /**
- * Creates the marshaling {@link JsonRepresentation}.
- *
- * @param mediaType The target media type.
- * @param source The source object to marshal.
- *
- * @return The marshaling {@link JsonRepresentation}.
- */
- protected <T> Representation create( MediaType mediaType, T source )
- {
- //noinspection unchecked
- return objectFactory.newObject( JsonRepresentation.class, source );
- }
-
- /**
- * Creates the unmarshaling {@link JsonRepresentation}.
- *
- * @param source The source representation to unmarshal.
- * @param objectClass The object class to instantiate.
- *
- * @return The unmarshaling {@link JsonRepresentation}.
- */
- protected <T> Representation create( Representation source, Class<T> objectClass )
- {
- if( VARIANT_WWW_FORM_URLENCODED.isCompatible( source ) )
- {
- return objectFactory.newObject( FormRepresentation.class, source, objectClass );
- }
- else if( VARIANT_JSON.isCompatible( source ) )
- {
- //noinspection unchecked
- return objectFactory.newObject( JsonRepresentation.class, source, objectClass );
- }
- return null;
- }
-
- public ObjectFactory getObjectFactory()
- {
- return objectFactory;
- }
-
- @Override
- public List<Class<?>> getObjectClasses( Variant source )
- {
- List<Class<?>> result = new ArrayList<>();
-
- if( isCompatible( source ) )
- {
- result = addObjectClass( result, Object.class );
- result = addObjectClass( result, JsonRepresentation.class );
- }
-
- return result;
- }
-
- @Override
- public List<VariantInfo> getVariants( Class<?> source )
- {
- List<VariantInfo> result = new ArrayList<>();
-
- if( source != null )
- {
- result = addVariant( result, VARIANT_JSON );
- result = addVariant( result, VARIANT_WWW_FORM_URLENCODED );
- }
-
- return result;
- }
-
- /**
- * Indicates if the given variant is compatible with the media types
- * supported by this converter.
- *
- * @param variant The variant.
- *
- * @return True if the given variant is compatible with the media types
- * supported by this converter.
- */
- protected boolean isCompatible( Variant variant )
- {
- //noinspection SimplifiableIfStatement
- if( variant == null )
- {
- return false;
- }
-
- return VARIANT_JSON.isCompatible( variant ) ||
- VARIANT_WWW_FORM_URLENCODED.isCompatible( variant )
- ;
- }
-
- @Override
- public float score( Object source, Variant target, Resource resource )
- {
- float result;
-
- if( source instanceof JsonRepresentation<?> )
- {
- result = 1.0F;
- }
- else
- {
- if( target == null )
- {
- result = 0.5F;
- }
- else if( isCompatible( target ) )
- {
- result = 0.8F;
- }
- else
- {
- result = 0.5F;
- }
- }
-
- return result;
- }
-
- @Override
- public <T> float score( Representation source, Class<T> target,
- Resource resource
- )
- {
- float result = -1.0F;
-
- if( source instanceof JsonRepresentation<?> )
- {
- result = 1.0F;
- }
- else if( ( target != null )
- && JsonRepresentation.class.isAssignableFrom( target ) )
- {
- result = 1.0F;
- }
- else if( isCompatible( source ) )
- {
- result = 0.8F;
- }
-
- return result;
- }
-
- @SuppressWarnings( "unchecked" )
- @Override
- public <T> T toObject( Representation source, Class<T> target, Resource resources )
- throws IOException
- {
- Object result = null;
-
- Representation representation = null;
- if( isCompatible( source ) )
- {
- representation = create( source, target );
- }
-
- if( representation != null )
- {
- // Handle the conversion
- if( ( target != null )
- && JsonRepresentation.class.isAssignableFrom( target ) )
- {
- result = representation;
- }
- else
- {
- if( representation instanceof JsonRepresentation )
- {
- result = ( (JsonRepresentation) representation ).getObject();
- }
- if( representation instanceof FormRepresentation )
- {
- result = ( (FormRepresentation) representation ).getObject();
- }
- }
- }
-
- return (T) result;
- }
-
- @Override
- public Representation toRepresentation( Object source, Variant target, Resource resource )
- {
- Representation result = null;
-
- if( source instanceof JsonRepresentation )
- {
- result = (JsonRepresentation<?>) source;
- }
- else
- {
- if( target.getMediaType() == null )
- {
- target.setMediaType( MediaType.APPLICATION_JSON );
- }
- if( isCompatible( target ) )
- {
- result = create( target.getMediaType(), source );
- }
- }
-
- return result;
- }
-
- @Override
- public <T> void updatePreferences( List<Preference<MediaType>> preferences,
- Class<T> entity
- )
- {
- updatePreferences( preferences, MediaType.APPLICATION_JSON, 1.0F );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/resources/META_INF/services/org.restlet.engine.converter.ConverterHelper
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/resources/META_INF/services/org.restlet.engine.converter.ConverterHelper b/libraries/restlet/src/main/resources/META_INF/services/org.restlet.engine.converter.ConverterHelper
deleted file mode 100644
index 3a8c7cf..0000000
--- a/libraries/restlet/src/main/resources/META_INF/services/org.restlet.engine.converter.ConverterHelper
+++ /dev/null
@@ -1,16 +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.
-
-org.apache.polygene.library.restlet.PolygeneConverter
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Customer.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Customer.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Customer.java
deleted file mode 100644
index 4245856..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Customer.java
+++ /dev/null
@@ -1,27 +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;
-
-import org.apache.polygene.api.identity.HasIdentity;
-
-public interface Customer extends HasIdentity
-{
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Order.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Order.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Order.java
deleted file mode 100644
index d37ff5e..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Order.java
+++ /dev/null
@@ -1,27 +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;
-
-import org.apache.polygene.api.identity.HasIdentity;
-
-public interface Order extends HasIdentity
-{
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Product.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Product.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Product.java
deleted file mode 100644
index 91078d0..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/Product.java
+++ /dev/null
@@ -1,27 +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;
-
-import org.apache.polygene.api.identity.HasIdentity;
-
-public interface Product extends HasIdentity
-{
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 51d56b4..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/TestApplication.java
+++ /dev/null
@@ -1,83 +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;
-
-import java.util.stream.Stream;
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.api.composite.ModelDescriptor;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Layer;
-import org.apache.polygene.api.structure.ModuleDescriptor;
-import org.apache.polygene.api.structure.TypeLookup;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.library.restlet.assembly.RestApplicationAssembler;
-import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationModule;
-import org.apache.polygene.library.restlet.assembly.configuration.ConfigurationLayer;
-import org.apache.polygene.library.restlet.assembly.connectivity.ConnectivityLayer;
-import org.apache.polygene.library.restlet.assembly.domain.DomainLayer;
-import org.apache.polygene.library.restlet.assembly.infrastructue.FileStorageModule;
-import org.apache.polygene.library.restlet.assembly.infrastructue.InfrastructureLayer;
-import org.apache.polygene.library.restlet.assembly.resource.ResourceLayer;
-
-import static java.util.stream.Stream.concat;
-
-// START SNIPPET: app
-public class TestApplication
-{
- private static final String NAME = "Test Application";
- private static final String VERSION = "1.0";
- private static final Application.Mode MODE = Application.Mode.development;
-
- // END SNIPPET: app
-
- public static void main( String[] args )
- throws Exception
- {
- RestApplicationAssembler assembler = new RestApplicationAssembler( NAME, VERSION, MODE,
- ConfigurationLayer.class,
- InfrastructureLayer.class,
- DomainLayer.class,
- ResourceLayer.class,
- ConnectivityLayer.class
- );
-
- assembler.initialize();
- assembler.application()
- .layers()
- .peek( layer -> System.out.println( layer + " uses " + layer.descriptor().usedLayers().toString() ) )
- .flatMap( Layer::modules )
- .peek( module -> System.out.println( " " + module ) )
- .flatMap( module -> {
- TypeLookup lookup = module.typeLookup();
- ModuleDescriptor model = module.descriptor();
- return concat( concat( lookup.allServices().filter( service -> model.equals( service.module() ) ),
- lookup.allEntities().filter( service -> model.equals( service.module() ) ) ),
- lookup.allValues().filter( service -> model.equals( service.module() ) ) );
- } )
- .forEach( composite -> System.out.println( " " + composite + ", visibility:" + composite.visibility().name() ) );
-
- assembler.start();
- assembler.addShutdownHook();
- }
- // START SNIPPET: app
-}
-// END SNIPPET: app
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index e0a46d8..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/RestApplicationAssembler.java
+++ /dev/null
@@ -1,81 +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 )
- {
- LayerAssembly layerBelow = null;
- for( Class<? extends LayerAssembler> layer : layers )
- {
- LayerAssembly layerAssembly = createLayer( layer );
- assemblies.put( layer, layerAssembly );
- if( layerBelow != null )
- {
- layerAssembly.uses( layerBelow );
- }
- layerBelow = layerAssembly;
- }
- }
-
- public LayerAssembly layer( Class<? extends LayerAssembler> layerClass )
- {
- 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/3a26d21d/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
deleted file mode 100644
index e615347..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/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
deleted file mode 100644
index 48ce3a9..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/configuration/ConfigurationModule.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.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/3a26d21d/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
deleted file mode 100644
index c0d45dc..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/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
deleted file mode 100644
index 29349f5..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/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
deleted file mode 100644
index 02ca63f..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/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
deleted file mode 100644
index 8e79c0a..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/CrudModule.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.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 )
- {
- module.defaultServices();
- new CrudServiceAssembler().assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 19bf91d..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/DomainLayer.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.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 );
- createModule( layer, OrdersModule.class );
- return layer;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/OrdersModule.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/OrdersModule.java b/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/OrdersModule.java
deleted file mode 100644
index 6bbd79f..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/domain/OrdersModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.restlet.assembly.domain;
-
-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.Customer;
-import org.apache.polygene.library.restlet.Order;
-import org.apache.polygene.library.restlet.Product;
-import org.apache.polygene.library.restlet.assembly.RestletCrudModuleAssembler;
-
-public class OrdersModule
- implements ModuleAssembler
-{
- @Override
- public ModuleAssembly assemble( LayerAssembly layer, ModuleAssembly module )
- throws AssemblyException
- {
- new RestletCrudModuleAssembler( Order.class ).assemble( module );
- new RestletCrudModuleAssembler( Customer.class ).assemble( module );
- new RestletCrudModuleAssembler( Product.class ).assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index a1ac266..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/FileStorageModule.java
+++ /dev/null
@@ -1,51 +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 )
- {
- module.defaultServices().visibleIn( Visibility.layer );
- new FileEntityStoreAssembler()
- .visibleIn( Visibility.application )
- .withConfig( configModule, Visibility.application )
- .assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 72997f1..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/IndexingModule.java
+++ /dev/null
@@ -1,49 +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 RdfNativeSesameStoreAssembler(Visibility.application, Visibility.module)
- .withConfig( configModule, Visibility.application )
- .assemble( module );
- return module;
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index ac6375f..0000000
--- a/libraries/restlet/src/test/java/org/apache/polygene/library/restlet/assembly/infrastructue/InfrastructureLayer.java
+++ /dev/null
@@ -1,55 +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 );
- }
-
- private InfrastructureLayer( ModuleAssembly configModule )
- {
- this.configModule = configModule;
- }
-
- @Override
- public LayerAssembly assemble( LayerAssembly layer )
- {
- new FileStorageModule( configModule ).assemble( layer, layer.module( FileStorageModule.NAME ) );
- 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/3a26d21d/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
deleted file mode 100644
index 85bb76d..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/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
deleted file mode 100644
index a209315..0000000
--- a/libraries/restlet/src/test/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/3a26d21d/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index d9704ff..e410c6a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,7 +40,6 @@ include 'core:api',
'libraries:rest-client',
'libraries:rest-common',
'libraries:rest-server',
- 'libraries:restlet',
'libraries:scripting',
'libraries:servlet',
'libraries:shiro-core',
[3/4] polygene-java git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ni...@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/c76a0bf6
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/c76a0bf6
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/c76a0bf6
Branch: refs/heads/develop
Commit: c76a0bf6151f61a5fdd67b425d7e8748de4cafef
Parents: 3a26d21 4fb01aa
Author: niclas <ni...@hedhman.org>
Authored: Fri Apr 6 08:44:39 2018 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Apr 6 08:44:39 2018 +0800
----------------------------------------------------------------------
.../api/composite/CompositeDescriptor.java | 4 +-
.../polygene/api/object/ObjectDescriptor.java | 3 +-
.../api/service/ImportedServiceDescriptor.java | 3 +-
.../api/util/VisitableModelDescriptor.java | 30 ++++++++++
.../runtime/composite/CompositeModel.java | 2 +-
.../runtime/composite/CompositesModel.java | 61 +++++++++++++++++++
.../runtime/composite/TransientsModel.java | 38 +-----------
.../polygene/runtime/entity/EntitiesModel.java | 40 ++-----------
.../polygene/runtime/object/ObjectModel.java | 2 +-
.../polygene/runtime/object/ObjectsModel.java | 34 ++---------
.../runtime/service/ImportedServiceModel.java | 2 +-
.../service/ImportedServicesInstance.java | 4 +-
.../runtime/service/ImportedServicesModel.java | 49 ++++-----------
.../runtime/service/ServicesInstance.java | 4 +-
.../polygene/runtime/service/ServicesModel.java | 60 ++++---------------
.../polygene/runtime/structure/ModuleModel.java | 63 ++++----------------
.../polygene/runtime/value/ValuesModel.java | 40 ++-----------
.../skeletons/SQLCompatEntityStateWrapper.java | 7 +++
.../polygene/library/rdf/model/Model2XML.java | 2 +-
.../ImportedServiceCompositeDescriptor.java | 7 +++
20 files changed, 170 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
[2/4] polygene-java git commit: POLYGENE-298 - Removed
library-restlet. Formatting in the other rest libraries
Posted by ni...@apache.org.
POLYGENE-298 - Removed library-restlet.
Formatting in the other rest libraries
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/3a26d21d
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/3a26d21d
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/3a26d21d
Branch: refs/heads/develop
Commit: 3a26d21dd999b9b8ec8cfca0092219b1b793085e
Parents: 8d0d8dc
Author: niclas <ni...@hedhman.org>
Authored: Tue Apr 3 18:52:34 2018 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Tue Apr 3 18:52:34 2018 +0800
----------------------------------------------------------------------
.../ContextResourceClientFactoryTest.java | 89 +++----
.../responsewriter/TableResponseWriter.java | 2 +-
.../ValueCompositeResponseWriter.java | 2 +-
.../server/restlet/responsewriter/resource.htm | 2 +-
.../server/restlet/responsewriter/table.htm | 2 +-
.../server/restlet/responsewriter/value.htm | 3 +-
libraries/restlet/build.gradle | 50 ----
libraries/restlet/dev-status.xml | 38 ---
libraries/restlet/src/docs/restlet.txt | 63 -----
.../polygene/library/restlet/Command.java | 29 --
.../library/restlet/ConversionException.java | 29 --
.../library/restlet/HasDescription.java | 31 ---
.../polygene/library/restlet/HasName.java | 28 --
.../PolygeneRestApplicationLauncher.java | 104 --------
.../library/restlet/PolygeneServerServlet.java | 46 ----
.../polygene/library/restlet/RestLink.java | 30 ---
.../restlet/assembly/CrudServiceAssembler.java | 39 ---
.../RestletCrudConnectivityAssembler.java | 69 -----
.../assembly/RestletCrudModuleAssembler.java | 74 ------
.../library/restlet/crud/EntityList.java | 33 ---
.../library/restlet/crud/EntityRef.java | 35 ---
.../restlet/crud/HasIdentitySpecification.java | 44 ----
.../crud/RepositoryNotFoundException.java | 29 --
.../library/restlet/filters/NameFilter.java | 40 ---
.../library/restlet/identity/CanonicalName.java | 56 ----
.../restlet/identity/IdentityManager.java | 156 -----------
.../identity/IdentityMappingConfiguration.java | 33 ---
.../InvalidIdentityFormatException.java | 29 --
.../library/restlet/metainfo/UserIdentity.java | 66 -----
.../library/restlet/repository/EntityName.java | 64 -----
.../repository/EntityTypeDescriptor.java | 42 ---
.../repository/MissingRepositoryException.java | 29 --
.../restlet/repository/RepositoryLocator.java | 62 -----
.../resource/DefaultResourceFactoryImpl.java | 101 -------
.../library/restlet/resource/EntryPoint.java | 31 ---
.../restlet/resource/NotPresentException.java | 25 --
.../library/restlet/resource/Parameterizer.java | 25 --
.../restlet/resource/ResourceFactory.java | 31 ---
.../restlet/resource/ServerResource.java | 109 --------
.../serialization/FormRepresentation.java | 150 -----------
.../serialization/JsonRepresentation.java | 135 ----------
.../serialization/PolygeneConverter.java | 263 -------------------
...org.restlet.engine.converter.ConverterHelper | 16 --
.../polygene/library/restlet/Customer.java | 27 --
.../apache/polygene/library/restlet/Order.java | 27 --
.../polygene/library/restlet/Product.java | 27 --
.../library/restlet/TestApplication.java | 83 ------
.../assembly/RestApplicationAssembler.java | 81 ------
.../configuration/ConfigurationLayer.java | 45 ----
.../configuration/ConfigurationModule.java | 40 ---
.../connectivity/ConnectivityLayer.java | 39 ---
.../assembly/connectivity/RestModule.java | 40 ---
.../assembly/connectivity/SecurityModule.java | 35 ---
.../restlet/assembly/domain/CrudModule.java | 39 ---
.../restlet/assembly/domain/DomainLayer.java | 38 ---
.../restlet/assembly/domain/OrdersModule.java | 44 ----
.../infrastructue/FileStorageModule.java | 51 ----
.../assembly/infrastructue/IndexingModule.java | 49 ----
.../infrastructue/InfrastructureLayer.java | 55 ----
.../infrastructue/SerializationModule.java | 37 ---
.../assembly/resource/ResourceLayer.java | 37 ---
settings.gradle | 1 -
62 files changed, 50 insertions(+), 3079 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java
index 80db1bf..b6854f5 100644
--- a/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java
+++ b/libraries/rest-client/src/test/java/org/apache/polygene/library/rest/client/ContextResourceClientFactoryTest.java
@@ -125,7 +125,6 @@ public class ContextResourceClientFactoryTest
module.objects( RootRestlet.class, RootResource.class, RootContext.class, SubResource1.class, PagesResource.class );
-
module.objects( DescribableContext.class );
module.transients( TestComposite.class );
@@ -146,18 +145,18 @@ public class ContextResourceClientFactoryTest
server = new Server( Protocol.HTTP, port );
ContextRestlet restlet = objectFactory.newObject( ContextRestlet.class, new org.restlet.Context() );
- ChallengeAuthenticator guard = new ChallengeAuthenticator(null, ChallengeScheme.HTTP_BASIC, "testRealm");
+ ChallengeAuthenticator guard = new ChallengeAuthenticator( null, ChallengeScheme.HTTP_BASIC, "testRealm" );
MapVerifier mapVerifier = new MapVerifier();
- mapVerifier.getLocalSecrets().put("rickard", "secret".toCharArray());
- guard.setVerifier(mapVerifier);
+ mapVerifier.getLocalSecrets().put( "rickard", "secret".toCharArray() );
+ guard.setVerifier( mapVerifier );
- guard.setNext(restlet);
+ guard.setNext( restlet );
server.setNext( guard );
server.start();
//START SNIPPET: client-create1
- Client client = new Client( Protocol.HTTP );
+ Client client = new Client( Protocol.HTTP );
ContextResourceClientFactory contextResourceClientFactory = objectFactory.newObject( ContextResourceClientFactory.class, client );
contextResourceClientFactory.setAcceptedMediaTypes( MediaType.APPLICATION_JSON );
@@ -171,14 +170,16 @@ public class ContextResourceClientFactoryTest
@Override
public HandlerCommand handleResponse( Response response, ContextResourceClient client )
{
- if (tried)
- throw new ResourceException( response.getStatus() );
+ if( tried )
+ {
+ throw new ResourceException( response.getStatus() );
+ }
- tried = true;
- client.getContextResourceClientFactory().getInfo().setUser( new User("rickard", "secret") );
+ tried = true;
+ client.getContextResourceClientFactory().getInfo().setUser( new User( "rickard", "secret" ) );
- // Try again
- return refresh();
+ // Try again
+ return refresh();
}
} ).onError( ErrorHandler.RECOVERABLE_ERROR, new ResponseHandler()
{
@@ -222,15 +223,15 @@ public class ContextResourceClientFactoryTest
return query( "querywithoutvalue" );
}
} ).
- onQuery( "querywithoutvalue", new ResultHandler<TestResult>()
- {
- @Override
- public HandlerCommand handleResult( TestResult result, ContextResourceClient client )
- {
- Assert.assertThat( result.xyz().get(), CoreMatchers.equalTo( "bar" ) );
- return null;
- }
- } );
+ onQuery( "querywithoutvalue", new ResultHandler<TestResult>()
+ {
+ @Override
+ public HandlerCommand handleResult( TestResult result, ContextResourceClient client )
+ {
+ Assert.assertThat( result.xyz().get(), CoreMatchers.equalTo( "bar" ) );
+ return null;
+ }
+ } );
crc.start();
//END SNIPPET: query-without-value
@@ -351,7 +352,7 @@ public class ContextResourceClientFactoryTest
@Test
public void testIndexedResource()
{
- crc.newClient("subcontext/pages/").onResource( new ResultHandler<Resource>()
+ crc.newClient( "subcontext/pages/" ).onResource( new ResultHandler<Resource>()
{
@Override
public HandlerCommand handleResult( Resource result, ContextResourceClient client )
@@ -359,16 +360,15 @@ public class ContextResourceClientFactoryTest
return query( "index" );
}
} ).onQuery( "index", new ResultHandler<Links>()
- {
- @Override
- public HandlerCommand handleResult( Links result, ContextResourceClient client )
- {
- Assert.assertEquals( result.links().get().size(), 3 );
- return null;
- }
- } )
- .start();
-
+ {
+ @Override
+ public HandlerCommand handleResult( Links result, ContextResourceClient client )
+ {
+ Assert.assertEquals( result.links().get().size(), 3 );
+ return null;
+ }
+ } )
+ .start();
}
public interface TestQuery
@@ -441,10 +441,10 @@ public class ContextResourceClientFactoryTest
public Links commandwithvalue()
{
- return new LinksBuilder(module).
- command( "commandwithvalue" ).
- addLink( "Command ABC","right" ).
- addLink( "Command XYZ", "wrong" ).newLinks();
+ return new LinksBuilder( module ).
+ command( "commandwithvalue" ).
+ addLink( "Command ABC", "right" ).
+ addLink( "Command XYZ", "wrong" ).newLinks();
}
@Override
@@ -519,7 +519,7 @@ public class ContextResourceClientFactoryTest
}
@Requires( File.class )
- public TestResult queryWithRoleRequirement(TestQuery query)
+ public TestResult queryWithRoleRequirement( TestQuery query )
{
return context( SubContext.class ).queryWithRoleRequirement( query );
}
@@ -549,7 +549,8 @@ public class ContextResourceClientFactoryTest
}
@SubResource
- public void pages() {
+ public void pages()
+ {
subResource( PagesResource.class );
}
}
@@ -566,7 +567,7 @@ public class ContextResourceClientFactoryTest
public TestResult queryWithValue( TestQuery query )
{
- return vbf.newValueFromSerializedState( TestResult.class, "{\"xyz\":\""+query.abc().get()+"\"}" );
+ return vbf.newValueFromSerializedState( TestResult.class, "{\"xyz\":\"" + query.abc().get() + "\"}" );
}
public TestResult queryWithoutValue()
@@ -705,11 +706,11 @@ public class ContextResourceClientFactoryTest
@Override
public Links index()
{
- return new LinksBuilder(module)
- .addLink( "Page1", "page1")
- .addLink( "Page2", "page2")
- .addLink( "Page3", "page3")
- .newLinks();
+ return new LinksBuilder( module )
+ .addLink( "Page1", "page1" )
+ .addLink( "Page2", "page2" )
+ .addLink( "Page3", "page3" )
+ .newLinks();
}
}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java
index 55ebe77..68bc264 100644
--- a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java
+++ b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/TableResponseWriter.java
@@ -152,7 +152,7 @@ public class TableResponseWriter extends AbstractResponseWriter
JsonObjectBuilder cellBuilder = jsonBuilderFactory.createObjectBuilder();
if( value != null )
{
- cellBuilder.add( "v", jsonSerializer.toJson( Serializer.Options.ALL_TYPE_INFO, value ) );
+ cellBuilder.add( "v", jsonSerializer.toJson( Serializer.Options.NO_TYPE_INFO, value ) );
}
if( cellValue.f().get() != null )
{
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
index 845b256..5e32b39 100644
--- a/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
+++ b/libraries/rest-server/src/main/java/org/apache/polygene/library/rest/server/restlet/responsewriter/ValueCompositeResponseWriter.java
@@ -63,7 +63,7 @@ public class ValueCompositeResponseWriter extends AbstractResponseWriter
MediaType type = getVariant( response.getRequest(), ENGLISH, supportedMediaTypes ).getMediaType();
if( MediaType.APPLICATION_JSON.equals( type ) )
{
- StringRepresentation representation = new StringRepresentation( serializer.serialize( Serializer.Options.ALL_TYPE_INFO, result ),
+ StringRepresentation representation = new StringRepresentation( serializer.serialize( Serializer.Options.NO_TYPE_INFO, result ),
MediaType.APPLICATION_JSON );
response.setEntity( representation );
return true;
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm
index 4c00354..fbff49b 100644
--- a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm
+++ b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/resource.htm
@@ -19,7 +19,7 @@
-->
<!-- Default resource template -->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>${request.resourceRef.remainingPart}</title>
</head>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm
index e9ce307..63b9eec 100644
--- a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm
+++ b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/table.htm
@@ -18,7 +18,7 @@
~
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<table border="1">
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm
----------------------------------------------------------------------
diff --git a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm
index 971fd24..0796e4c 100644
--- a/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm
+++ b/libraries/rest-server/src/main/resources/org/apache/polygene/library/rest/server/restlet/responsewriter/value.htm
@@ -17,8 +17,7 @@
~
~
-->
-
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
<body>
<ul>
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/restlet/build.gradle b/libraries/restlet/build.gradle
deleted file mode 100644
index 7a8705c..0000000
--- a/libraries/restlet/build.gradle
+++ /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.
- *
- *
- */
-import org.apache.polygene.gradle.TaskGroups
-
-apply plugin: 'polygene-library'
-
-description = "Apache Polygene™ Restlet Library provides automatic CRUD resources as well as custom resources integrated to Polygene."
-
-jar { manifest { name = "Apache Polygene™ Library - Restlet" } }
-
-dependencies {
- compileOnly libraries.servlet_api
-
- api polygene.core.bootstrap
-
- implementation libraries.restlet
-
- runtimeOnly polygene.core.runtime
-
- 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
-}
-
-task runRestletSample( type: JavaExec, dependsOn: 'testClasses' ) {
- group = TaskGroups.SAMPLES
- description = "Runs $project.name sample."
- classpath = sourceSets.test.runtimeClasspath
- main = 'org.apache.polygene.library.restlet.TestApplication'
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/restlet/dev-status.xml b/libraries/restlet/dev-status.xml
deleted file mode 100644
index 97fd7ff..0000000
--- a/libraries/restlet/dev-status.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- ~ 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.
- ~
- ~
- -->
-<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
- http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
- <status>
- <!--none,early,beta,stable,mature-->
- <codebase>stable</codebase>
-
- <!-- none, brief, good, complete -->
- <documentation>brief</documentation>
-
- <!-- none, some, good, complete -->
- <unittests>some</unittests>
- </status>
- <licenses>
- <license>ALv2</license>
- </licenses>
-</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/docs/restlet.txt
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/docs/restlet.txt b/libraries/restlet/src/docs/restlet.txt
deleted file mode 100644
index 69cd82a..0000000
--- a/libraries/restlet/src/docs/restlet.txt
+++ /dev/null
@@ -1,63 +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.
-///////////////////////////////////////////////////////////////
-
-[[library-restlet, Restlet Library]]
-= Restlet Support =
-
-[devstatus]
---------------
-source=libraries/restlet/dev-status.xml
---------------
-
-The Restlet Support Library has support to expose CRUD operations directly
-as well as regular Rest resources.
-
-include::../../build/docs/buildinfo/artifact.txt[]
-
-This library leverages +restlet.org+ which has a very neat way to map resources
-to URIs, and flexible ways to be served the requests. This library defines
-all the plumbing needed to set up Restlet, map resources to URIs, convert
-Polygene ValueComposites to resource representations (such as JSON) and
-create a fully HATEOAS environment, with single bookmarkable URI.
-
-To set up the Restlet Connectivity Module, it is recommended to use the provided
-+Assembler+ for it;
-
-
-[[library-restlet-resource-binding, Restlet Resource Binding]]
-== Resource Binding ==
-REST defines that all URLs are *resources* and that a known, small set of
-operations can be done on those resources.
-
-
-
-== CRUD Repository ==
-This library provides a +CrudRepository+ which simplifies accessing entities
-directly from the Rest module. This is implemented by using the
-<<library-restlet-resource-binding, Resource Binding>> above.
-
-It also requires that one or more Crud Modules are defined. These are typically
-either in the domain layer directly, or in the layer above (some call that the
-service layer). There is a RestletCrudModuleAssembler that helps set up such
-module. Typical setup is like this;
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/Command.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/Command.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/Command.java
deleted file mode 100644
index cd739fe..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/Command.java
+++ /dev/null
@@ -1,29 +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;
-
-import org.apache.polygene.api.property.Property;
-
-public interface Command
-{
- Property<String> name();
-
- Property<RestForm> form();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/ConversionException.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/ConversionException.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/ConversionException.java
deleted file mode 100644
index 5e11e3c..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/ConversionException.java
+++ /dev/null
@@ -1,29 +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;
-
-public class ConversionException extends RuntimeException
-{
- public ConversionException( String entityAsText )
- {
- super( "Unable to convert REST entity: " + entityAsText );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasDescription.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasDescription.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasDescription.java
deleted file mode 100644
index d4a8f85..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasDescription.java
+++ /dev/null
@@ -1,31 +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;
-
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.common.UseDefaults;
-import org.apache.polygene.api.property.Property;
-
-public interface HasDescription
-{
- @Optional @UseDefaults
- Property<String> description();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasName.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasName.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasName.java
deleted file mode 100644
index a8f6517..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/HasName.java
+++ /dev/null
@@ -1,28 +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;
-
-import org.apache.polygene.api.property.Property;
-
-public interface HasName
-{
- Property<String> name();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplicationLauncher.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplicationLauncher.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplicationLauncher.java
deleted file mode 100644
index 956e1e7..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneRestApplicationLauncher.java
+++ /dev/null
@@ -1,104 +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;
-
-import org.apache.polygene.api.activation.ActivationException;
-import org.apache.polygene.api.activation.PassivationException;
-import org.apache.polygene.api.composite.TransientBuilderFactory;
-import org.apache.polygene.api.object.ObjectFactory;
-import org.apache.polygene.api.service.ServiceFinder;
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.api.structure.Module;
-import org.apache.polygene.api.unitofwork.UnitOfWorkFactory;
-import org.apache.polygene.api.value.ValueBuilderFactory;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.layered.LayeredApplicationAssembler;
-
-@SuppressWarnings( "WeakerAccess" )
-public abstract class PolygeneRestApplicationLauncher
-{
- protected org.apache.polygene.api.structure.Application polygeneApplication;
- protected ServiceFinder serviceFinder;
- protected ObjectFactory objectFactory;
- protected TransientBuilderFactory transientBuilderFactory;
- protected UnitOfWorkFactory unitOfWorkFactory;
- protected ValueBuilderFactory valueBuilderFactory;
- protected Module entryModule;
-
- public void initialize()
- throws ActivationException
- {
- polygeneApplication = createApplication();
- activateApplication();
- entryModule = polygeneApplication.findModule( entryLayer(), entryModule() );
- serviceFinder = entryModule;
- objectFactory = entryModule;
- transientBuilderFactory = entryModule;
- unitOfWorkFactory = entryModule.unitOfWorkFactory();
- valueBuilderFactory = entryModule;
- }
-
- protected abstract String entryLayer();
-
- protected abstract String entryModule();
-
- protected void activateApplication()
- throws ActivationException
- {
- polygeneApplication.activate();
- }
-
- protected Application createApplication()
- {
- try
- {
- LayeredApplicationAssembler assembler = createApplicationAssembler();
- assembler.initialize();
- return assembler.application();
- }
- catch( Throwable e )
- {
- throw new RuntimeException( "Unable to start Polygene application.", e );
- }
- }
-
- protected abstract LayeredApplicationAssembler createApplicationAssembler()
- throws AssemblyException;
-
- protected void installShutdownHook()
- {
- Runtime.getRuntime().addShutdownHook( new Thread( this::shutdown ) );
- }
-
- protected void shutdown()
- {
- try
- {
- if( polygeneApplication != null )
- {
- polygeneApplication.passivate();
- }
- }
- catch( PassivationException e )
- {
- throw new RuntimeException( "Unable to shut down cleanly.", e );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 834dd33..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java
+++ /dev/null
@@ -1,46 +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;
-
-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.restlet.Context;
-import org.restlet.ext.servlet.ServerServlet;
-
-/**
- * Restlet ServerServlet backed by a org.restlet.Application object.
- */
-@Mixins( PolygeneServerServlet.Mixin.class )
-public interface PolygeneServerServlet extends Servlet
-{
- class Mixin extends ServerServlet
- {
- @Structure
- private ObjectFactory objectFactory;
-
- @Override
- protected org.restlet.Application createApplication( Context parentContext )
- {
- return objectFactory.newObject( PolygeneRestApplication.class, parentContext.createChildContext() );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/RestLink.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/RestLink.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/RestLink.java
deleted file mode 100644
index c2b4371..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/RestLink.java
+++ /dev/null
@@ -1,30 +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;
-
-import org.apache.polygene.api.property.Property;
-
-public interface RestLink extends HasDescription
-{
- Property<String> method();
-
- Property<String> path();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/CrudServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/CrudServiceAssembler.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/CrudServiceAssembler.java
deleted file mode 100644
index 7e55a75..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/CrudServiceAssembler.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;
-
-import org.apache.polygene.api.common.Visibility;
-import org.apache.polygene.bootstrap.Assembler;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.library.restlet.identity.IdentityManager;
-import org.apache.polygene.library.restlet.identity.IdentityMappingConfiguration;
-import org.apache.polygene.library.restlet.repository.RepositoryLocator;
-
-public class CrudServiceAssembler
- implements Assembler
-{
- @Override
- public void assemble( ModuleAssembly module )
- {
- module.entities( IdentityMappingConfiguration.class );
- module.services( IdentityManager.class ).visibleIn( Visibility.application ).instantiateOnStartup();
- module.services( RepositoryLocator.class ).visibleIn( Visibility.application );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index 0eb1d5e..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudConnectivityAssembler.java
+++ /dev/null
@@ -1,69 +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.api.common.Visibility;
-import org.apache.polygene.bootstrap.Assembler;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.library.restlet.Command;
-import org.apache.polygene.library.restlet.FormField;
-import org.apache.polygene.library.restlet.PolygeneEntityRestlet;
-import org.apache.polygene.library.restlet.RestForm;
-import org.apache.polygene.library.restlet.RestLink;
-import org.apache.polygene.library.restlet.crud.EntityList;
-import org.apache.polygene.library.restlet.crud.EntityListResource;
-import org.apache.polygene.library.restlet.crud.EntityRef;
-import org.apache.polygene.library.restlet.crud.EntityResource;
-import org.apache.polygene.library.restlet.resource.CreationResource;
-import org.apache.polygene.library.restlet.resource.DefaultResourceFactoryImpl;
-import org.apache.polygene.library.restlet.resource.EntryPointResource;
-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
-{
- @Override
- public void assemble( ModuleAssembly module )
- {
- module.values( EntryPointResource.class,
- EntityListResource.class,
- EntityResource.class,
- CreationResource.class )
- .visibleIn( Visibility.layer );
- module.values( Command.class,
- FormField.class,
- RestForm.class,
- RestLink.class,
- EntityList.class,
- EntityRef.class )
- .visibleIn( Visibility.layer );
- module.objects( DefaultResourceFactoryImpl.class,
- JsonRepresentation.class,
- FormRepresentation.class,
- PolygeneEntityRestlet.class )
- .visibleIn( Visibility.layer );
- module.services( ResourceBuilder.class ).visibleIn( Visibility.layer );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/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
deleted file mode 100644
index f6c07e0..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/assembly/RestletCrudModuleAssembler.java
+++ /dev/null
@@ -1,74 +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.api.common.Visibility;
-import org.apache.polygene.api.unitofwork.concern.UnitOfWorkConcern;
-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;
-
-/**
- * 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;
-
- public RestletCrudModuleAssembler( Class type, Class repositoryType )
- {
- this.type = type;
- this.repositoryType = repositoryType;
- }
-
- public RestletCrudModuleAssembler( Class type )
- {
- this.type = type;
- repositoryType = CrudRepository.class;
- }
-
- @Override
- public void assemble( ModuleAssembly module )
- {
- super.assemble( module );
- ServiceDeclaration declaration = module
- .addServices( repositoryType )
- .visibleIn( Visibility.application )
- .withMixins( SmallCrudRepositoryMixin.class )
- .withConcerns( UnitOfWorkConcern.class )
- .taggedWith( type.getSimpleName() )
- .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/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityList.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityList.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityList.java
deleted file mode 100644
index 7eebdce..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityList.java
+++ /dev/null
@@ -1,33 +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.crud;
-
-import java.util.List;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.property.Property;
-import org.apache.polygene.library.restlet.Command;
-
-public interface EntityList extends HasIdentity
-{
- Property<List<EntityRef>> entities();
-
- Property<List<Command>> commands();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityRef.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityRef.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityRef.java
deleted file mode 100644
index d077a17..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/EntityRef.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.crud;
-
-import org.apache.polygene.api.property.Property;
-import org.apache.polygene.library.restlet.RestLink;
-
-public interface EntityRef
-{
- Property<String> name();
-
- Property<RestLink> get();
-
- Property<RestLink> put();
-
- Property<RestLink> delete();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/HasIdentitySpecification.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/HasIdentitySpecification.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/HasIdentitySpecification.java
deleted file mode 100644
index ce359ca..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/HasIdentitySpecification.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- */
-
-package org.apache.polygene.library.restlet.crud;
-
-import java.util.Objects;
-import java.util.function.Predicate;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.identity.Identity;
-
-public class HasIdentitySpecification
- implements Predicate<HasIdentity>
-{
- private final Identity id;
-
- public HasIdentitySpecification(Identity identity )
- {
- Objects.requireNonNull( identity, "reference" );
- this.id = identity;
- }
-
- @Override
- public boolean test( HasIdentity item )
- {
- return id.equals( item.identity().get() );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/RepositoryNotFoundException.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/RepositoryNotFoundException.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/RepositoryNotFoundException.java
deleted file mode 100644
index b330aa1..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/crud/RepositoryNotFoundException.java
+++ /dev/null
@@ -1,29 +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.crud;
-
-public class RepositoryNotFoundException extends RuntimeException
-{
- public RepositoryNotFoundException( Class entityType )
- {
- super( "No repository found for " + entityType.getName() );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/filters/NameFilter.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/filters/NameFilter.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/filters/NameFilter.java
deleted file mode 100644
index d23a3aa..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/filters/NameFilter.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.filters;
-
-import java.util.function.Predicate;
-import org.apache.polygene.library.restlet.HasName;
-
-public class NameFilter implements Predicate<HasName>
-{
- private final String name;
-
- public NameFilter( String name )
- {
- this.name = name;
- }
-
- @Override
- public boolean test( HasName hasName )
- {
- return hasName.name().get().equals(name);
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/CanonicalName.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/CanonicalName.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/CanonicalName.java
deleted file mode 100644
index 3e8ee8b..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/CanonicalName.java
+++ /dev/null
@@ -1,56 +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.identity;
-
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.injection.scope.Service;
-import org.apache.polygene.api.injection.scope.This;
-import org.apache.polygene.api.mixin.Mixins;
-
-@Mixins( CanonicalName.Mixin.class )
-public interface CanonicalName
-{
- String name();
-
- Class type();
-
- class Mixin
- implements CanonicalName
- {
- @This
- private HasIdentity me;
-
- @Service
- private IdentityManager manager;
-
- @Override
- public String name()
- {
- return manager.extractName( me.identity().get() );
- }
-
- @Override
- public Class type()
- {
- return manager.extractType( me.identity().get() );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
deleted file mode 100644
index e7b66fa..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityManager.java
+++ /dev/null
@@ -1,156 +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.identity;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.concern.Concerns;
-import org.apache.polygene.api.configuration.Configuration;
-import org.apache.polygene.api.identity.Identity;
-import org.apache.polygene.api.identity.IdentityGenerator;
-import org.apache.polygene.api.identity.StringIdentity;
-import org.apache.polygene.api.injection.scope.Service;
-import org.apache.polygene.api.injection.scope.This;
-import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.unitofwork.concern.UnitOfWorkConcern;
-import org.apache.polygene.api.unitofwork.concern.UnitOfWorkPropagation;
-
-@Mixins( IdentityManager.Mixin.class )
-@Concerns( { UnitOfWorkConcern.class } )
-public interface IdentityManager
-{
- String SEPARATOR = "~";
- String IDENTITY_SIGNATURE = "[0-9][0-9]*~.*";
-
- boolean isIdentity( String candidate );
-
- Identity generate( Class type, @Optional String canonicalName );
-
- String extractName( Identity identity );
-
- Class extractType( Identity identity );
-
- @UnitOfWorkPropagation
- String findPrefix( Class type );
-
- class Mixin
- implements IdentityManager
- {
- @Service
- private IdentityGenerator uuidService;
-
- @This
- private Configuration<IdentityMappingConfiguration> config;
-
- private ConcurrentHashMap<String, Class> actualClasses = new ConcurrentHashMap<>();
-
- @Override
- public boolean isIdentity( String candidate )
- {
- return candidate.matches( IDENTITY_SIGNATURE );
- }
-
- @Override
- public Identity generate( Class type, String canonicalName )
- {
- if( canonicalName == null )
- {
- canonicalName = uuidService.generate( type ).toString();
- }
- if( isIdentity( canonicalName ) )
- {
- // This is already an ID, and we simply return it.
- return StringIdentity.identityOf( canonicalName );
- }
- String prefix = findPrefix( type );
- return StringIdentity.identityOf( prefix + SEPARATOR + canonicalName );
- }
-
- @Override
- public String findPrefix( Class type )
- {
- Map<String, String> mapping = config.get().mapping().get();
- String prefix = mapping.get( type.getName() );
- if( prefix == null )
- {
- config.refresh();
- mapping = config.get().mapping().get();
- prefix = Integer.toString( mapping.size() + 1 );
- mapping.put( type.getName(), prefix );
- config.get().mapping().set( mapping );
- config.save();
- }
- actualClasses.put( type.getName(), type );
- return prefix;
- }
-
- @Override
- public String extractName( Identity identity )
- {
- String idString = identity.toString();
- int pos = idString.indexOf( SEPARATOR );
- if( pos < 1 )
- {
- throw new InvalidIdentityFormatException( idString );
- }
- return idString.substring( pos + 1 );
- }
-
- @Override
- public Class extractType( Identity identity )
- {
- String idString = identity.toString();
- if( !isIdentity( idString ) )
- {
- throw new IllegalArgumentException( "Given argument '" + idString + "' is not an Identity" );
- }
- int pos = idString.indexOf( SEPARATOR );
- if( pos < 1 )
- {
- throw new InvalidIdentityFormatException( idString );
- }
- String prefix = idString.substring( 0, pos );
- Map.Entry<String, String> found = config.get().mapping().get().entrySet().stream()
- .filter( new FindClassSpecification( prefix ) )
- .findFirst().orElse( null );
- return found == null ? null : actualClasses.get( found.getKey() );
- }
-
- private static class FindClassSpecification
- implements Predicate<Map.Entry<String, String>>
- {
- private String prefix;
-
- private FindClassSpecification( String prefix )
- {
- this.prefix = prefix;
- }
-
- @Override
- public boolean test( Map.Entry<String, String> item )
- {
- return item.getValue().equals( prefix );
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityMappingConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityMappingConfiguration.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityMappingConfiguration.java
deleted file mode 100644
index e30d0ed..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/IdentityMappingConfiguration.java
+++ /dev/null
@@ -1,33 +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.identity;
-
-import java.util.Map;
-import org.apache.polygene.api.common.Optional;
-import org.apache.polygene.api.common.UseDefaults;
-import org.apache.polygene.api.property.Property;
-
-public interface IdentityMappingConfiguration
-{
- @Optional
- @UseDefaults
- Property<Map<String, String>> mapping();
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/InvalidIdentityFormatException.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/InvalidIdentityFormatException.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/InvalidIdentityFormatException.java
deleted file mode 100644
index 7514304..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/identity/InvalidIdentityFormatException.java
+++ /dev/null
@@ -1,29 +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.identity;
-
-public class InvalidIdentityFormatException extends RuntimeException
-{
- public InvalidIdentityFormatException( String identity )
- {
- super( "The given reference wasn't generated by the UrlIdentityManager: " + identity );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/metainfo/UserIdentity.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/metainfo/UserIdentity.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/metainfo/UserIdentity.java
deleted file mode 100644
index 58bcdbc..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/metainfo/UserIdentity.java
+++ /dev/null
@@ -1,66 +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.metainfo;
-
-public class UserIdentity
-{
- private final String identifier;
- private final String name;
- private final String email;
- private final String firstName;
- private final String lastName;
-
- public UserIdentity( String identifier, String name, String email, String firstName, String lastName )
- {
- this.identifier = identifier;
- this.name = name;
- this.email = email;
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- public String identifier()
- {
- return identifier;
- }
-
- public String name()
- {
- return name;
- }
-
- public String email()
- {
- return email;
- }
-
- public String firstName()
- {
- return firstName;
- }
-
- public String lastName()
- {
- return lastName;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityName.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityName.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityName.java
deleted file mode 100644
index 64dd5db..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityName.java
+++ /dev/null
@@ -1,64 +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.repository;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import org.apache.polygene.api.constraint.ConstraintDeclaration;
-import org.apache.polygene.api.constraint.Constraints;
-import org.apache.polygene.library.restlet.identity.IdentityManager;
-
-@ConstraintDeclaration
-@Retention( RetentionPolicy.RUNTIME )
-@Constraints( EntityName.Constraint.class )
-public @interface EntityName
-{
-
- class Constraint
- implements org.apache.polygene.api.constraint.Constraint<EntityName, String>
- {
-
- @Override
- public boolean isValid( EntityName annotation, String value )
- {
- int pos = value.indexOf( IdentityManager.SEPARATOR );
- if( pos > 0 )
- {
- value = value.substring( pos+1 );
- }
- for( int i = 0; i < value.length(); i++ )
- {
- char ch = value.charAt( i );
- if( ( ch < 'A' || ch > 'Z' ) &&
- ( ch < 'a' || ch > 'z' ) &&
- ( ch < '0' || ch > '9' ) &&
- ( ch != '.' ) &&
- ( ch != '_' ) &&
- ( ch != '-' )
- )
- {
- return false;
- }
- }
- return true;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityTypeDescriptor.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityTypeDescriptor.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityTypeDescriptor.java
deleted file mode 100644
index 2779b56..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/EntityTypeDescriptor.java
+++ /dev/null
@@ -1,42 +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.repository;
-
-public class EntityTypeDescriptor
-{
- private Class entityType;
-
- public EntityTypeDescriptor( Class entityType )
- {
- this.entityType = entityType;
- }
-
- public Class entityType()
- {
- return entityType;
- }
-
- @Override
- public String toString()
- {
- return "EntityTypeDescriptor{" + entityType + '}';
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/MissingRepositoryException.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/MissingRepositoryException.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/MissingRepositoryException.java
deleted file mode 100644
index 3836ec0..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/MissingRepositoryException.java
+++ /dev/null
@@ -1,29 +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.repository;
-
-public class MissingRepositoryException extends RuntimeException
-{
- public MissingRepositoryException( Class typeName )
- {
- super( "There is no Entity Repository @Tagged with the name '" + typeName + "'" );
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/RepositoryLocator.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/RepositoryLocator.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/RepositoryLocator.java
deleted file mode 100644
index 09d6b04..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/repository/RepositoryLocator.java
+++ /dev/null
@@ -1,62 +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.repository;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.StreamSupport;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.injection.scope.Service;
-import org.apache.polygene.api.mixin.Mixins;
-import org.apache.polygene.api.service.ServiceReference;
-
-@Mixins( RepositoryLocator.Mixin.class )
-public interface RepositoryLocator
-{
- <T extends HasIdentity> CrudRepository<T> find(Class<T> entityType );
-
- class Mixin
- implements RepositoryLocator
- {
-
- private Map<Class, CrudRepository> repositories = new HashMap<>();
-
- public Mixin( @Service Iterable<ServiceReference<CrudRepository>> repositories )
- {
- StreamSupport.stream( repositories.spliterator(), true ).forEach( ref -> {
- Class type = ref.metaInfo( EntityTypeDescriptor.class ).entityType();
- this.repositories.put( type, ref.get() );
- } );
- }
-
- @Override
- public <T extends HasIdentity> CrudRepository<T> find(Class<T> entityType )
- {
- @SuppressWarnings( "unchecked" )
- CrudRepository<T> repository = repositories.get( entityType );
- if( repository == null )
- {
- throw new MissingRepositoryException( entityType );
- }
- return repository;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/DefaultResourceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/DefaultResourceFactoryImpl.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/DefaultResourceFactoryImpl.java
deleted file mode 100644
index d1508d3..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/DefaultResourceFactoryImpl.java
+++ /dev/null
@@ -1,101 +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.resource;
-
-import java.util.Map;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.injection.scope.Uses;
-import org.apache.polygene.api.property.PropertyDescriptor;
-import org.apache.polygene.api.value.ValueBuilder;
-import org.apache.polygene.api.value.ValueBuilderFactory;
-import org.apache.polygene.spi.PolygeneSPI;
-import org.restlet.Context;
-import org.restlet.Request;
-import org.restlet.Response;
-import org.restlet.routing.Router;
-
-public class DefaultResourceFactoryImpl<K extends HasIdentity, T extends ServerResource<K>>
- implements ResourceFactory<K, T>
-{
- @Uses
- private Class<T> resourceType;
-
- @Uses
- private Context context;
-
- @Uses
- private Router router;
-
- @Uses
- private Request request;
-
- @Structure
- private ValueBuilderFactory vbf;
-
- @Structure
- private PolygeneSPI spi;
-
- @Override
- public T create( Class<T> entityType, Request request, Response response, Context context )
- {
- final Map<String, Object> attributes = request.getAttributes();
- String id = (String) attributes.get( "id" );
-
- ValueBuilder<T> builder = vbf.newValueBuilderWithState(
- resourceType,
- descriptor -> findValue( attributes, descriptor ),
- descriptor -> null,
- descriptor -> null,
- descriptor -> null
- );
- //noinspection unchecked
- ServerResource.Parameters<T> params = builder.prototypeFor( ServerResource.Parameters.class );
- params.id().set( id );
- params.entityType().set( entityType );
- params.context().set( this.context );
- params.request().set( request );
- params.router().set( router );
- params.response().set( response );
- return builder.newInstance();
- }
-
- private Object findValue( Map<String, Object> attributes, PropertyDescriptor descriptor )
- {
- String name = descriptor.qualifiedName().name();
- if( name.equals( "reference" ) )
- {
- Object id = attributes.get( "id" );
- if( id == null )
- {
- throw new IllegalArgumentException( resourceType.getName() + " implements Identity and must have an {id} attribute in the path template." );
- }
- return id;
- }
- return attributes.get( name );
- }
-
- @Override
- public String toString()
- {
- return "factory[" + ( resourceType == null ? "<null>" : resourceType.getSimpleName()) + "]";
- }
-}
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/3a26d21d/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPoint.java
----------------------------------------------------------------------
diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPoint.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPoint.java
deleted file mode 100644
index 3a74b63..0000000
--- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/resource/EntryPoint.java
+++ /dev/null
@@ -1,31 +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.resource;
-
-import java.util.Map;
-import org.apache.polygene.api.identity.HasIdentity;
-import org.apache.polygene.api.property.Property;
-import org.apache.polygene.library.restlet.RestLink;
-
-public interface EntryPoint extends HasIdentity
-{
- Property<Map<String,RestLink>> api();
-}
[4/4] polygene-java git commit: Artwork adjustments and website
update to new logo.
Posted by ni...@apache.org.
Artwork adjustments and website update to new logo.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/1adfa573
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/1adfa573
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/1adfa573
Branch: refs/heads/develop
Commit: 1adfa57322bd859529d26415fae5321a2aeb03bd
Parents: c76a0bf
Author: niclas <ni...@hedhman.org>
Authored: Fri Apr 13 08:38:13 2018 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Fri Apr 13 08:38:13 2018 +0800
----------------------------------------------------------------------
artwork/logo-234x137.png | Bin 0 -> 10228 bytes
artwork/logo-234x83.png | Bin 0 -> 6901 bytes
artwork/logo-514x300.png | Bin 0 -> 23424 bytes
artwork/logo-599x211.png | Bin 0 -> 18253 bytes
artwork/logo-flag.png | Bin 0 -> 16196 bytes
artwork/logo.svg | 33 ++-
artwork/pb-polygene-128x128png.png | Bin 0 -> 11593 bytes
artwork/pb-polygene-256x256png.png | Bin 0 -> 25278 bytes
artwork/pb-polygene-512x512png.png | Bin 0 -> 52405 bytes
dependencies.gradle | 334 +++++++++++++--------------
manual/src/docs/website/xsl/chunked.xsl | 2 +-
11 files changed, 188 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo-234x137.png
----------------------------------------------------------------------
diff --git a/artwork/logo-234x137.png b/artwork/logo-234x137.png
new file mode 100644
index 0000000..3fa0268
Binary files /dev/null and b/artwork/logo-234x137.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo-234x83.png
----------------------------------------------------------------------
diff --git a/artwork/logo-234x83.png b/artwork/logo-234x83.png
new file mode 100644
index 0000000..349ccae
Binary files /dev/null and b/artwork/logo-234x83.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo-514x300.png
----------------------------------------------------------------------
diff --git a/artwork/logo-514x300.png b/artwork/logo-514x300.png
new file mode 100644
index 0000000..3352c18
Binary files /dev/null and b/artwork/logo-514x300.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo-599x211.png
----------------------------------------------------------------------
diff --git a/artwork/logo-599x211.png b/artwork/logo-599x211.png
new file mode 100644
index 0000000..01b6b59
Binary files /dev/null and b/artwork/logo-599x211.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo-flag.png
----------------------------------------------------------------------
diff --git a/artwork/logo-flag.png b/artwork/logo-flag.png
new file mode 100644
index 0000000..6c8c9eb
Binary files /dev/null and b/artwork/logo-flag.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/logo.svg
----------------------------------------------------------------------
diff --git a/artwork/logo.svg b/artwork/logo.svg
index bd16fd2..26329ed 100644
--- a/artwork/logo.svg
+++ b/artwork/logo.svg
@@ -18,6 +18,7 @@
*
*
-->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -36,7 +37,10 @@
enable-background="new 0 0 612 792"
xml:space="preserve"
sodipodi:docname="logo.svg"
- inkscape:version="0.92.1 r15371"><metadata
+ inkscape:version="0.92.1 r15371"
+ inkscape:export-filename="/home/niclas/dev/polygene/java/artwork/logo-514x300.png"
+ inkscape:export-xdpi="221.71413"
+ inkscape:export-ydpi="221.71413"><metadata
id="metadata4663"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
@@ -54,7 +58,7 @@
id="namedview4659"
showgrid="false"
inkscape:zoom="1.0239899"
- inkscape:cx="173.67447"
+ inkscape:cx="19.864359"
inkscape:cy="384.28113"
inkscape:window-x="0"
inkscape:window-y="0"
@@ -62,17 +66,24 @@
inkscape:current-layer="g4622" /><g
id="g4622"><text
xml:space="preserve"
- style="font-style:normal;font-weight:normal;font-size:40px;line-height:25px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ed1c24;fill-opacity:1;stroke:none"
- x="150.01727"
- y="402.86316"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:35.7921257px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ed1c24;fill-opacity:1;stroke:none"
+ x="146.01727"
+ y="382.86316"
id="text4789"><tspan
sodipodi:role="line"
- x="150.01727"
- y="402.86316"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;font-family:Asap;-inkscape-font-specification:'Asap Bold';fill:#ed1c24;fill-opacity:1"
- id="tspan4807"><tspan
- id="tspan4505"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:42.66666794px;font-family:Asap;-inkscape-font-specification:Asap;fill:#969696;fill-opacity:1">Apache</tspan>Polygene</tspan></text>
+ x="146.01727"
+ y="382.86316"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:35.7921257px;font-family:Asap;-inkscape-font-specification:Asap;fill:#969696;fill-opacity:1"
+ id="tspan4807">A<tspan
+ style="line-height:35.7921257px"
+ id="tspan4101">pache</tspan></tspan><tspan
+ sodipodi:role="line"
+ x="146.01727"
+ y="422.01538"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.66666794px;line-height:35.7921257px;font-family:Asap;-inkscape-font-specification:'Asap Bold';fill:#ed1c24;fill-opacity:1"
+ id="tspan4099"><tspan
+ style="line-height:35.7921257px"
+ id="tspan4103">Polyge</tspan>ne</tspan></text>
</g><path
fill-rule="evenodd"
clip-rule="evenodd"
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/pb-polygene-128x128png.png
----------------------------------------------------------------------
diff --git a/artwork/pb-polygene-128x128png.png b/artwork/pb-polygene-128x128png.png
new file mode 100644
index 0000000..047c9ab
Binary files /dev/null and b/artwork/pb-polygene-128x128png.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/pb-polygene-256x256png.png
----------------------------------------------------------------------
diff --git a/artwork/pb-polygene-256x256png.png b/artwork/pb-polygene-256x256png.png
new file mode 100644
index 0000000..4f3197d
Binary files /dev/null and b/artwork/pb-polygene-256x256png.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/artwork/pb-polygene-512x512png.png
----------------------------------------------------------------------
diff --git a/artwork/pb-polygene-512x512png.png b/artwork/pb-polygene-512x512png.png
new file mode 100644
index 0000000..b753a39
Binary files /dev/null and b/artwork/pb-polygene-512x512png.png differ
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index b4a8c86..b90ab01 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,17 +17,17 @@
*/
import org.apache.polygene.gradle.dependencies.DependenciesDeclarationExtension
-def dependencies = extensions.getByType( DependenciesDeclarationExtension )
+def dependencies = extensions.getByType(DependenciesDeclarationExtension)
// Gradle version
dependencies.gradleVersion = '4.2.1'
// Remote repositories
dependencies.repositoriesUrls << [
- mavenCentral: "https://repo1.maven.org/maven2/",
- restlet : 'https://maven.restlet.com/',
- clojars : "https://clojars.org/repo/",
- oracle : "http://download.oracle.com/maven/"
+ mavenCentral: "https://repo1.maven.org/maven2/",
+ restlet : 'https://maven.restlet.com/',
+ clojars : "https://clojars.org/repo/",
+ oracle : "http://download.oracle.com/maven/"
]
// Core dependencies
@@ -35,11 +35,11 @@ def asmVersion = '5.2'
def javaxJsonVersion = '1.1'
def osgiVersion = '4.3.1'
dependencies.libraries << [
- asm : "org.ow2.asm:asm:$asmVersion",
- asm_commons: "org.ow2.asm:asm-commons:$asmVersion",
- asm_util : "org.ow2.asm:asm-util:$asmVersion",
- javax_json : "javax.json:javax.json-api:$javaxJsonVersion",
- osgi_core : "org.osgi:org.osgi.core:$osgiVersion",
+ asm : "org.ow2.asm:asm:$asmVersion",
+ asm_commons: "org.ow2.asm:asm-commons:$asmVersion",
+ asm_util : "org.ow2.asm:asm-util:$asmVersion",
+ javax_json : "javax.json:javax.json-api:$javaxJsonVersion",
+ osgi_core : "org.osgi:org.osgi.core:$osgiVersion",
]
// Extensions, Libraries and Tools dependencies
@@ -83,92 +83,92 @@ def springVersion = '4.3.9.RELEASE'
def spymemcachedVersion = '2.12.3'
def velocityVersion = '1.7'
dependencies.libraries << [
- bdb_je : "com.sleepycat:je:$bdbjeVersion",
- bonecp : "com.jolbox:bonecp:$bonecpVersion",
- bouncy_castle : [
- "org.bouncycastle:bcprov-jdk15on:$bouncyVersion",
- "org.bouncycastle:bcpkix-jdk15on:$bouncyVersion",
- "org.bouncycastle:bctls-jdk15on:$bouncyVersion"
- ],
- cassandra_client : "com.datastax.cassandra:cassandra-driver-core:$cassandraClientVersion",
- codahale_metrics : [ "io.dropwizard.metrics:metrics-core:$codahaleMetricsVersion",
- "io.dropwizard.metrics:metrics-healthchecks:$codahaleMetricsVersion" ],
- commons_dbcp : "org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
- commons_lang : "org.apache.commons:commons-lang3:$commonsLangVersion",
- commons_validator : "commons-validator:commons-validator:$commonsValidatorVersion",
- ehcache : "org.ehcache:ehcache:$ehcacheVersion",
- 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.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",
- hazelcast : "com.hazelcast:hazelcast:$hazelcastVersion",
- http_client : "org.apache.httpcomponents:httpclient:$httpClientVersion",
- jackson_mapper : "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
- jaxb_api : "javax.xml.bind:jaxb-api:$jaxbApiVersion",
- jclouds_core : "org.apache.jclouds:jclouds-core:$jcloudsVersion",
- jclouds_blobstore : "org.apache.jclouds:jclouds-allblobstore:$jcloudsVersion",
- jclouds_filesystem : "org.apache.jclouds.api:filesystem:$jcloudsVersion",
- jetty_server : "org.eclipse.jetty:jetty-server:$jettyVersion",
- jetty_webapp : "org.eclipse.jetty:jetty-webapp:$jettyVersion",
- jetty_servlet : "org.eclipse.jetty:jetty-servlet:$jettyVersion",
- jetty_http : "org.eclipse.jetty:jetty-http:$jettyVersion",
- jetty_io : "org.eclipse.jetty:jetty-io:$jettyVersion",
- jetty_jmx : "org.eclipse.jetty:jetty-jmx:$jettyVersion",
- jetty_security : "org.eclipse.jetty:jetty-security:$jettyVersion",
- jetty_jsp : "org.eclipse.jetty:jetty-jsp:$jettyVersion",
- jetty_util : "org.eclipse.jetty:jetty-util:$jettyVersion",
- jetty_continuation : "org.eclipse.jetty:jetty-continuation:$jettyVersion",
- jetty_client : "org.eclipse.jetty:jetty-client:$jettyVersion",
- jetty_xml : "org.eclipse.jetty:jetty-xml:$jettyVersion",
- johnzon : "org.apache.johnzon:johnzon-core:$johnzonVersion",
- jooq : "org.jooq:jooq:$jooqVersion",
- jdbm : "jdbm:jdbm:$jdbmVersion",
- jedis : "redis.clients:jedis:$jedisVersion",
- leveldb_api : "org.iq80.leveldb:leveldb-api:$leveldbVersion",
- leveldb_java : "org.iq80.leveldb:leveldb:$leveldbVersion",
- leveldb_jni_all : "org.fusesource.leveldbjni:leveldbjni-all:$leveldbJniVersion",
- liquibase : "org.liquibase:liquibase-core:$liquibaseVersion",
- mongodb : "org.mongodb:mongo-java-driver:$mongodbVersion",
- msgpack : "org.msgpack:msgpack-core:$msgpackVersion",
- osgi_compendium : "org.osgi:org.osgi.compendium:$osgiVersion",
- osgi_enterprise : "org.osgi:org.osgi.enterprise:$osgiVersion",
- restlet : [ "org.restlet.jee:org.restlet:$restletVersion",
- "org.restlet.jee:org.restlet.ext.atom:$restletVersion",
- "org.restlet.jee:org.restlet.ext.servlet:$restletVersion",
- "org.restlet.jee:org.restlet.ext.slf4j:$restletVersion" ],
- restlet_xml : "org.restlet.jee:org.restlet.ext.xml:$restletVersion",
- riak : "com.basho.riak:riak-client:$riakVersion",
- servlet_api : "javax.servlet:javax.servlet-api:$servletVersion",
- sesame : [ "org.openrdf.sesame:sesame-model:$rdfVersion",
- "org.openrdf.sesame:sesame-queryparser-sparql:$rdfVersion",
- "org.openrdf.sesame:sesame-repository-dataset:$rdfVersion",
- "org.openrdf.sesame:sesame-repository-http:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-api:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-n3:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-ntriples:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-rdfxml:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-trig:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-trix:$rdfVersion",
- "org.openrdf.sesame:sesame-rio-turtle:$rdfVersion",
- "org.openrdf.sesame:sesame-sail-api:$rdfVersion",
- "org.openrdf.sesame:sesame-sail-memory:$rdfVersion",
- "org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion",
- "org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion" ],
- shiro : "org.apache.shiro:shiro-core:$shiroVersion",
- shiro_web : "org.apache.shiro:shiro-web:$shiroVersion",
- slf4j_api : "org.slf4j:slf4j-api:$slf4jVersion",
- solr : [ "org.apache.solr:solr-core:$solrVersion",
- "org.apache.solr:solr-solrj:$solrVersion" ],
- sparql : [ "org.openrdf.sesame:sesame-queryresultio-sparqlxml:$rdfVersion",
- "org.openrdf.sesame:sesame-queryresultio-sparqljson:$rdfVersion" ],
- spring_core : [ "org.springframework:spring-beans:$springVersion",
- "org.springframework:spring-context:$springVersion" ],
- spymemcached : "net.spy:spymemcached:$spymemcachedVersion",
- velocity : "org.apache.velocity:velocity:$velocityVersion",
+ bdb_je : "com.sleepycat:je:$bdbjeVersion",
+ bonecp : "com.jolbox:bonecp:$bonecpVersion",
+ bouncy_castle : [
+ "org.bouncycastle:bcprov-jdk15on:$bouncyVersion",
+ "org.bouncycastle:bcpkix-jdk15on:$bouncyVersion",
+ "org.bouncycastle:bctls-jdk15on:$bouncyVersion"
+ ],
+ cassandra_client : "com.datastax.cassandra:cassandra-driver-core:$cassandraClientVersion",
+ codahale_metrics : ["io.dropwizard.metrics:metrics-core:$codahaleMetricsVersion",
+ "io.dropwizard.metrics:metrics-healthchecks:$codahaleMetricsVersion"],
+ commons_dbcp : "org.apache.commons:commons-dbcp2:$commonsDbcpVersion",
+ commons_lang : "org.apache.commons:commons-lang3:$commonsLangVersion",
+ commons_validator : "commons-validator:commons-validator:$commonsValidatorVersion",
+ ehcache : "org.ehcache:ehcache:$ehcacheVersion",
+ 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.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",
+ hazelcast : "com.hazelcast:hazelcast:$hazelcastVersion",
+ http_client : "org.apache.httpcomponents:httpclient:$httpClientVersion",
+ jackson_mapper : "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+ jaxb_api : "javax.xml.bind:jaxb-api:$jaxbApiVersion",
+ jclouds_core : "org.apache.jclouds:jclouds-core:$jcloudsVersion",
+ jclouds_blobstore : "org.apache.jclouds:jclouds-allblobstore:$jcloudsVersion",
+ jclouds_filesystem: "org.apache.jclouds.api:filesystem:$jcloudsVersion",
+ jetty_server : "org.eclipse.jetty:jetty-server:$jettyVersion",
+ jetty_webapp : "org.eclipse.jetty:jetty-webapp:$jettyVersion",
+ jetty_servlet : "org.eclipse.jetty:jetty-servlet:$jettyVersion",
+ jetty_http : "org.eclipse.jetty:jetty-http:$jettyVersion",
+ jetty_io : "org.eclipse.jetty:jetty-io:$jettyVersion",
+ jetty_jmx : "org.eclipse.jetty:jetty-jmx:$jettyVersion",
+ jetty_security : "org.eclipse.jetty:jetty-security:$jettyVersion",
+ jetty_jsp : "org.eclipse.jetty:jetty-jsp:$jettyVersion",
+ jetty_util : "org.eclipse.jetty:jetty-util:$jettyVersion",
+ jetty_continuation: "org.eclipse.jetty:jetty-continuation:$jettyVersion",
+ jetty_client : "org.eclipse.jetty:jetty-client:$jettyVersion",
+ jetty_xml : "org.eclipse.jetty:jetty-xml:$jettyVersion",
+ johnzon : "org.apache.johnzon:johnzon-core:$johnzonVersion",
+ jooq : "org.jooq:jooq:$jooqVersion",
+ jdbm : "jdbm:jdbm:$jdbmVersion",
+ jedis : "redis.clients:jedis:$jedisVersion",
+ leveldb_api : "org.iq80.leveldb:leveldb-api:$leveldbVersion",
+ leveldb_java : "org.iq80.leveldb:leveldb:$leveldbVersion",
+ leveldb_jni_all : "org.fusesource.leveldbjni:leveldbjni-all:$leveldbJniVersion",
+ liquibase : "org.liquibase:liquibase-core:$liquibaseVersion",
+ mongodb : "org.mongodb:mongo-java-driver:$mongodbVersion",
+ msgpack : "org.msgpack:msgpack-core:$msgpackVersion",
+ osgi_compendium : "org.osgi:org.osgi.compendium:$osgiVersion",
+ osgi_enterprise : "org.osgi:org.osgi.enterprise:$osgiVersion",
+ restlet : ["org.restlet.jee:org.restlet:$restletVersion",
+ "org.restlet.jee:org.restlet.ext.atom:$restletVersion",
+ "org.restlet.jee:org.restlet.ext.servlet:$restletVersion",
+ "org.restlet.jee:org.restlet.ext.slf4j:$restletVersion"],
+ restlet_xml : "org.restlet.jee:org.restlet.ext.xml:$restletVersion",
+ riak : "com.basho.riak:riak-client:$riakVersion",
+ servlet_api : "javax.servlet:javax.servlet-api:$servletVersion",
+ sesame : ["org.openrdf.sesame:sesame-model:$rdfVersion",
+ "org.openrdf.sesame:sesame-queryparser-sparql:$rdfVersion",
+ "org.openrdf.sesame:sesame-repository-dataset:$rdfVersion",
+ "org.openrdf.sesame:sesame-repository-http:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-api:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-n3:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-ntriples:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-rdfxml:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-trig:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-trix:$rdfVersion",
+ "org.openrdf.sesame:sesame-rio-turtle:$rdfVersion",
+ "org.openrdf.sesame:sesame-sail-api:$rdfVersion",
+ "org.openrdf.sesame:sesame-sail-memory:$rdfVersion",
+ "org.openrdf.sesame:sesame-sail-nativerdf:$rdfVersion",
+ "org.openrdf.sesame:sesame-sail-rdbms:$rdfVersion"],
+ shiro : "org.apache.shiro:shiro-core:$shiroVersion",
+ shiro_web : "org.apache.shiro:shiro-web:$shiroVersion",
+ slf4j_api : "org.slf4j:slf4j-api:$slf4jVersion",
+ solr : ["org.apache.solr:solr-core:$solrVersion",
+ "org.apache.solr:solr-solrj:$solrVersion"],
+ sparql : ["org.openrdf.sesame:sesame-queryresultio-sparqlxml:$rdfVersion",
+ "org.openrdf.sesame:sesame-queryresultio-sparqljson:$rdfVersion"],
+ spring_core : ["org.springframework:spring-beans:$springVersion",
+ "org.springframework:spring-context:$springVersion"],
+ spymemcached : "net.spy:spymemcached:$spymemcachedVersion",
+ velocity : "org.apache.velocity:velocity:$velocityVersion",
]
// Tools dependencies
@@ -176,9 +176,9 @@ def jgoodiesLooksVersion = '2.7.0'
def pdfboxVersion = '2.0.6'
def prefuseVersion = '1.0.1'
dependencies.libraries << [
- jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
- pdfbox : "org.apache.pdfbox:pdfbox:$pdfboxVersion",
- prefuse : "de.sciss:prefuse-core:$prefuseVersion",
+ jgoodies_looks: "com.jgoodies:jgoodies-looks:$jgoodiesLooksVersion",
+ pdfbox : "org.apache.pdfbox:pdfbox:$pdfboxVersion",
+ prefuse : "de.sciss:prefuse-core:$prefuseVersion",
]
// Runtime, Test and Samples dependencies
@@ -189,7 +189,7 @@ def easyMockVersion = '3.4'
def h2Version = '1.4.196'
def hamcrestVersion = '1.3'
def jaxRsApiVersion = '2.0.1'
-def junitVersion = '4.12'
+def junit5Version = '5.1.1'
def logbackVersion = '1.2.3' // TODO Replace with Apache Log4j 2
def mockitoVersion = '2.8.47'
def mysqlVersion = '6.0.6'
@@ -197,93 +197,89 @@ def postgresqlVersion = '42.1.4'
def sqliteVersion = '3.19.3'
def xmlUnitVersion = '2.3.0'
dependencies.libraries << [
- awaitility : "org.awaitility:awaitility:$awaitilityVersion",
- derby : "org.apache.derby:derby:$derbyVersion",
- dnsjava : "dnsjava:dnsjava:$dnsJavaVersion",
- docker_junit : "com.github.tdomzal:junit-docker-rule:$dockerJUnitVersion",
- easymock : "org.easymock:easymock:$easyMockVersion",
- h2 : "com.h2database:h2:$h2Version",
- hamcrest : [ "org.hamcrest:hamcrest-core:$hamcrestVersion",
- "org.hamcrest:hamcrest-library:$hamcrestVersion" ],
- junit : "junit:junit:$junitVersion",
- logback : "ch.qos.logback:logback-classic:$logbackVersion",
- mockito : "org.mockito:mockito-core:$mockitoVersion",
- mysql_connector : "mysql:mysql-connector-java:$mysqlVersion",
- postgres : "org.postgresql:postgresql:$postgresqlVersion",
- spring_testsupport: "org.springframework:spring-test:$springVersion",
- sqlite : "org.xerial:sqlite-jdbc:$sqliteVersion",
- xmlunit : "org.xmlunit:xmlunit-matchers:$xmlUnitVersion",
+ awaitility : "org.awaitility:awaitility:$awaitilityVersion",
+ derby : "org.apache.derby:derby:$derbyVersion",
+ dnsjava : "dnsjava:dnsjava:$dnsJavaVersion",
+ docker_junit : "com.github.tdomzal:junit-docker-rule:$dockerJUnitVersion",
+ easymock : "org.easymock:easymock:$easyMockVersion",
+ h2 : "com.h2database:h2:$h2Version",
+ hamcrest : ["org.hamcrest:hamcrest-core:$hamcrestVersion",
+ "org.hamcrest:hamcrest-library:$hamcrestVersion"],
+ junit : [
+ "org.junit.jupiter:junit-jupiter-api:$junit5Version",
+ "org.junit.jupiter:junit-jupiter-params:$junit5Version",
+ "org.junit.vintage:junit-vintage-engine:$junit5Version"
+ ],
+ logback : "ch.qos.logback:logback-classic:$logbackVersion",
+ mockito : "org.mockito:mockito-core:$mockitoVersion",
+ mysql_connector : "mysql:mysql-connector-java:$mysqlVersion",
+ postgres : "org.postgresql:postgresql:$postgresqlVersion",
+ spring_testsupport: "org.springframework:spring-test:$springVersion",
+ sqlite : "org.xerial:sqlite-jdbc:$sqliteVersion",
+ xmlunit : "org.xmlunit:xmlunit-matchers:$xmlUnitVersion",
]
// Default dependencies
dependencies.defaultDependencies << [
- testImplementation: [ dependencies.libraries.junit, dependencies.libraries.hamcrest ]
+ testImplementation: [dependencies.libraries.junit, dependencies.libraries.hamcrest]
]
// Resolution rules
dependencies.dependencySubstitutionSpec = { DependencySubstitution substitution, ModuleComponentSelector dep ->
- // Always resolve ASM to the same version
- if( dep.group == 'org.ow2.asm' )
- {
- substitution.useTarget group: dep.group, name: dep.module, version: asmVersion
- }
- // Always resolve OSGi to the same version
- else if( dep.group == 'org.osgi' )
- {
- substitution.useTarget group: dep.group, name: dep.module, version: osgiVersion
- }
- // Always resolve SLF4J to the same version
- else if( dep.group == 'org.slf4j' )
- {
- substitution.useTarget group: dep.group, name: dep.module, version: slf4jVersion
- }
- // Always resolve Jackson to the same version
- else if( dep.group.startsWith( 'com.fasterxml.jackson' ) && dep.module != 'jackson-parent' )
- {
- substitution.useTarget group: dep.group, name: dep.module, version: jacksonVersion
- }
- // Always resolve JAX-RS API to the same version
- else if( [ 'jaxrs-api', 'jsr311-api', 'javax.ws.rs-api' ].contains( dep.module ) )
- {
- substitution.useTarget group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: jaxRsApiVersion
- }
- // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead
- else if( dep.group == 'woodstox' && dep.module == 'wstx-asl' )
- {
- substitution.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: dep.version
- }
- // some bad citizens have SNAPSHOT parents ...
- else if( dep.module == 'commons-sandbox-parent' && dep.version == '3-SNAPSHOT' )
- {
- substitution.useTarget group: dep.group, name: dep.module, version: '3'
- }
- // Findbugs Annotation is LGPL, use https://github.com/stephenc/findbugs-annotations which is
- // Apache 2 licensed instead
- else if( dep.group == 'net.sourceforge.findbugs' && dep.module == 'annotations' )
- {
- substitution.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
- }
+ // Always resolve ASM to the same version
+ if (dep.group == 'org.ow2.asm') {
+ substitution.useTarget group: dep.group, name: dep.module, version: asmVersion
+ }
+ // Always resolve OSGi to the same version
+ else if (dep.group == 'org.osgi') {
+ substitution.useTarget group: dep.group, name: dep.module, version: osgiVersion
+ }
+ // Always resolve SLF4J to the same version
+ else if (dep.group == 'org.slf4j') {
+ substitution.useTarget group: dep.group, name: dep.module, version: slf4jVersion
+ }
+ // Always resolve Jackson to the same version
+ else if (dep.group.startsWith('com.fasterxml.jackson') && dep.module != 'jackson-parent') {
+ substitution.useTarget group: dep.group, name: dep.module, version: jacksonVersion
+ }
+ // Always resolve JAX-RS API to the same version
+ else if (['jaxrs-api', 'jsr311-api', 'javax.ws.rs-api'].contains(dep.module)) {
+ substitution.useTarget group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: jaxRsApiVersion
+ }
+ // woodstox:wstx-asl is broken (no pom), use org.codehaus.woodstox:wstx-asl instead
+ else if (dep.group == 'woodstox' && dep.module == 'wstx-asl') {
+ substitution.useTarget group: 'org.codehaus.woodstox', name: 'wstx-asl', version: dep.version
+ }
+ // some bad citizens have SNAPSHOT parents ...
+ else if (dep.module == 'commons-sandbox-parent' && dep.version == '3-SNAPSHOT') {
+ substitution.useTarget group: dep.group, name: dep.module, version: '3'
+ }
+ // Findbugs Annotation is LGPL, use https://github.com/stephenc/findbugs-annotations which is
+ // Apache 2 licensed instead
+ else if (dep.group == 'net.sourceforge.findbugs' && dep.module == 'annotations') {
+ substitution.useTarget group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
+ }
}
// NodeJS
dependencies.nodeVersions << [
- node: '6.10.2',
- npm: '4.4.4'
+ node: '6.10.2',
+ npm : '4.4.4'
]
// Build Tools
dependencies.buildToolsVersions << [
- jacoco: '0.7.9'
+ jacoco: '0.7.9'
]
// Docker Images
dependencies.dockerImagesVersions << [
- cassandra: 'cassandra:3.10',
- memcached: 'memcached:1.4.39-alpine',
- mariadb : 'mariadb:10.1.21',
- 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-bb2a38c0'
+ cassandra: 'cassandra:3.10',
+ memcached: 'memcached:1.4.39-alpine',
+ mariadb : 'mariadb:10.1.21',
+ 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-bb2a38c0'
]
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1adfa573/manual/src/docs/website/xsl/chunked.xsl
----------------------------------------------------------------------
diff --git a/manual/src/docs/website/xsl/chunked.xsl b/manual/src/docs/website/xsl/chunked.xsl
index 4f76ff3..f5a09a4 100644
--- a/manual/src/docs/website/xsl/chunked.xsl
+++ b/manual/src/docs/website/xsl/chunked.xsl
@@ -72,7 +72,7 @@
<xsl:template name="header.navigation">
<div class="logo">
<a href="index.html">
- <img src="images/logo-standard.png"/>
+ <img src="images/logo-standard.png" style="width:80%;height:80%; padding-top:20px;"/>
</a>
</div>