polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [59/81] [abbrv] zest-java git commit: ZEST-195 ; Clean up the mistakes in the rename.
Date Sat, 17 Dec 2016 10:28:35 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneBootstrapBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneBootstrapBeanDefinitionParser.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneBootstrapBeanDefinitionParser.java
new file mode 100644
index 0000000..96508d6
--- /dev/null
+++ b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneBootstrapBeanDefinitionParser.java
@@ -0,0 +1,103 @@
+/*
+ *  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.spring.bootstrap.internal.application;
+
+import org.apache.polygene.library.spring.bootstrap.PolygeneApplicationBootstrap;
+import org.springframework.beans.BeanInstantiationException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.beans.factory.xml.XmlReaderContext;
+import org.w3c.dom.Element;
+
+import static org.apache.polygene.library.spring.bootstrap.Constants.BEAN_ID_POLYGENE_APPLICATION;
+import static org.springframework.beans.BeanUtils.instantiateClass;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+import static org.springframework.util.Assert.hasText;
+import static org.springframework.util.ClassUtils.forName;
+
+public final class PolygeneBootstrapBeanDefinitionParser
+        implements BeanDefinitionParser
+{
+
+    private static final String CLASS = "class";
+
+    @Override
+    public final BeanDefinition parse( Element anElement, ParserContext aParserContext )
+    {
+        PolygeneApplicationBootstrap bootstrap = createPolygeneApplicationBootstrap( anElement, aParserContext );
+        AbstractBeanDefinition factoryBeanDefinition = createPolygeneApplicationFactoryBeanDefinition( bootstrap );
+        registerBean( aParserContext, factoryBeanDefinition );
+        return factoryBeanDefinition;
+    }
+
+    private PolygeneApplicationBootstrap createPolygeneApplicationBootstrap( Element anElement, ParserContext aParserContext )
+    {
+        String bootstrapClassString = anElement.getAttribute( CLASS );
+        hasText( bootstrapClassString );
+        XmlReaderContext readerContext = aParserContext.getReaderContext();
+
+        Class<?> bootstrapClass;
+        try
+        {
+            bootstrapClass = forName( bootstrapClassString, getClass().getClassLoader() );
+        } catch ( ClassNotFoundException e )
+        {
+            readerContext.error( "Polygene bootstrap class [" + bootstrapClassString + "] is not found.", anElement );
+            return null;
+        }
+
+        if ( !PolygeneApplicationBootstrap.class.isAssignableFrom( bootstrapClass ) )
+        {
+            readerContext.error( CLASS + "attribute is not an instance of [" + PolygeneApplicationBootstrap.class.getName()
+                    + "] class", anElement );
+            return null;
+        }
+
+        PolygeneApplicationBootstrap bootstrap = null;
+        try
+        {
+            bootstrap = (PolygeneApplicationBootstrap) instantiateClass( bootstrapClass );
+        } catch ( BeanInstantiationException e )
+        {
+            readerContext.error( "Fail to instantiate Polygene bootstrap class [" + bootstrapClassString + "]", anElement,
+                    e );
+        }
+        return bootstrap;
+    }
+
+    private AbstractBeanDefinition createPolygeneApplicationFactoryBeanDefinition(
+        final PolygeneApplicationBootstrap applicationBootstrap
+    )
+    {
+        BeanDefinitionBuilder builder = rootBeanDefinition( PolygeneApplicationFactoryBean.class );
+        builder.addConstructorArgValue( applicationBootstrap );
+        return builder.getBeanDefinition();
+    }
+
+    private void registerBean( ParserContext aParserContext, BeanDefinition aBeanDefinition )
+    {
+        BeanDefinitionRegistry registry = aParserContext.getRegistry();
+        registry.registerBeanDefinition( BEAN_ID_POLYGENE_APPLICATION, aBeanDefinition );
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestApplicationFactoryBean.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestApplicationFactoryBean.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestApplicationFactoryBean.java
deleted file mode 100644
index 742052c..0000000
--- a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestApplicationFactoryBean.java
+++ /dev/null
@@ -1,119 +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.spring.bootstrap.internal.application;
-
-import org.apache.polygene.api.structure.Application;
-import org.apache.polygene.bootstrap.*;
-import org.apache.polygene.library.spring.bootstrap.PolygeneApplicationBootstrap;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanInitializationException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.Assert;
-
-/**
- * This class responsible to handle the lifecycle of Polygene application.
- */
-public final class PolygeneApplicationFactoryBean
-        implements FactoryBean, DisposableBean, InitializingBean, ApplicationContextAware
-{
-
-    private final PolygeneApplicationBootstrap applicationBootstrap;
-
-    private Application application;
-
-    public PolygeneApplicationFactoryBean( final PolygeneApplicationBootstrap applicationBootstrap )
-    {
-        Assert.notNull( applicationBootstrap, "'applicationBootstrap' must not be null" );
-        this.applicationBootstrap = applicationBootstrap;
-    }
-
-    @Override
-    public final Application getObject() throws Exception
-    {
-        if ( this.application == null )
-        {
-            this.application = this.createApplication();
-        }
-        return this.application;
-    }
-
-    @Override
-    public final Class<Application> getObjectType()
-    {
-        return Application.class;
-    }
-
-    @Override
-    public final boolean isSingleton()
-    {
-        return true;
-    }
-
-    @Override
-    public final void destroy() throws Exception
-    {
-        this.getObject().passivate();
-    }
-
-    @Override
-    public final void afterPropertiesSet() throws Exception
-    {
-        this.getObject().activate();
-    }
-
-    private Application createApplication()
-    {
-        Energy4Java energy4Java = new Energy4Java();
-        try
-        {
-            return energy4Java.newApplication( new ApplicationAssembler()
-            {
-
-                @Override
-                public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )
-                        throws AssemblyException
-                {
-                    final ApplicationAssembly applicationAssembly = applicationFactory.newApplicationAssembly();
-                    PolygeneApplicationFactoryBean.this.applicationBootstrap.assemble( applicationAssembly );
-                    return applicationAssembly;
-                }
-            } );
-        } catch ( AssemblyException e )
-        {
-            throw new BeanInitializationException( "Fail to bootstrap Polygene application.", e );
-        }
-
-    }
-
-    @Override
-    public void setApplicationContext( final ApplicationContext applicationContext ) throws BeansException
-    {
-        if ( this.applicationBootstrap instanceof ApplicationContextAware )
-        {
-            // propagate application context to the application bootstrap
-            ApplicationContextAware aware = (ApplicationContextAware) this.applicationBootstrap;
-            aware.setApplicationContext( applicationContext );
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestBootstrapBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestBootstrapBeanDefinitionParser.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestBootstrapBeanDefinitionParser.java
deleted file mode 100644
index 83daf0f..0000000
--- a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/ZestBootstrapBeanDefinitionParser.java
+++ /dev/null
@@ -1,103 +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.spring.bootstrap.internal.application;
-
-import org.apache.polygene.library.spring.bootstrap.PolygeneApplicationBootstrap;
-import org.springframework.beans.BeanInstantiationException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.beans.factory.xml.XmlReaderContext;
-import org.w3c.dom.Element;
-
-import static org.apache.polygene.library.spring.bootstrap.Constants.BEAN_ID_ZEST_APPLICATION;
-import static org.springframework.beans.BeanUtils.instantiateClass;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
-import static org.springframework.util.Assert.hasText;
-import static org.springframework.util.ClassUtils.forName;
-
-public final class PolygeneBootstrapBeanDefinitionParser
-        implements BeanDefinitionParser
-{
-
-    private static final String CLASS = "class";
-
-    @Override
-    public final BeanDefinition parse( Element anElement, ParserContext aParserContext )
-    {
-        PolygeneApplicationBootstrap bootstrap = createPolygeneApplicationBootstrap( anElement, aParserContext );
-        AbstractBeanDefinition factoryBeanDefinition = createPolygeneApplicationFactoryBeanDefinition( bootstrap );
-        registerBean( aParserContext, factoryBeanDefinition );
-        return factoryBeanDefinition;
-    }
-
-    private PolygeneApplicationBootstrap createPolygeneApplicationBootstrap( Element anElement, ParserContext aParserContext )
-    {
-        String bootstrapClassString = anElement.getAttribute( CLASS );
-        hasText( bootstrapClassString );
-        XmlReaderContext readerContext = aParserContext.getReaderContext();
-
-        Class<?> bootstrapClass;
-        try
-        {
-            bootstrapClass = forName( bootstrapClassString, getClass().getClassLoader() );
-        } catch ( ClassNotFoundException e )
-        {
-            readerContext.error( "Polygene bootstrap class [" + bootstrapClassString + "] is not found.", anElement );
-            return null;
-        }
-
-        if ( !PolygeneApplicationBootstrap.class.isAssignableFrom( bootstrapClass ) )
-        {
-            readerContext.error( CLASS + "attribute is not an instance of [" + PolygeneApplicationBootstrap.class.getName()
-                    + "] class", anElement );
-            return null;
-        }
-
-        PolygeneApplicationBootstrap bootstrap = null;
-        try
-        {
-            bootstrap = (PolygeneApplicationBootstrap) instantiateClass( bootstrapClass );
-        } catch ( BeanInstantiationException e )
-        {
-            readerContext.error( "Fail to instantiate Polygene bootstrap class [" + bootstrapClassString + "]", anElement,
-                    e );
-        }
-        return bootstrap;
-    }
-
-    private AbstractBeanDefinition createPolygeneApplicationFactoryBeanDefinition(
-        final PolygeneApplicationBootstrap applicationBootstrap
-    )
-    {
-        BeanDefinitionBuilder builder = rootBeanDefinition( PolygeneApplicationFactoryBean.class );
-        builder.addConstructorArgValue( applicationBootstrap );
-        return builder.getBeanDefinition();
-    }
-
-    private void registerBean( ParserContext aParserContext, BeanDefinition aBeanDefinition )
-    {
-        BeanDefinitionRegistry registry = aParserContext.getRegistry();
-        registry.registerBeanDefinition( BEAN_ID_ZEST_APPLICATION, aBeanDefinition );
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/PolygeneServiceBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/PolygeneServiceBeanDefinitionParser.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/PolygeneServiceBeanDefinitionParser.java
new file mode 100644
index 0000000..401fd39
--- /dev/null
+++ b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/PolygeneServiceBeanDefinitionParser.java
@@ -0,0 +1,55 @@
+/*
+ *  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.spring.bootstrap.internal.service;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
+import static org.apache.polygene.library.spring.bootstrap.Constants.BEAN_ID_POLYGENE_APPLICATION;
+import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
+
+public final class PolygeneServiceBeanDefinitionParser
+    implements BeanDefinitionParser
+{
+    private static final String SERVICE_ID = "id";
+
+    @Override
+    public final BeanDefinition parse( Element anElement, ParserContext aParserContext )
+    {
+        String serviceId = anElement.getAttribute( SERVICE_ID );
+
+        // Service factory bean
+        BeanDefinitionBuilder builder = rootBeanDefinition( ServiceFactoryBean.class );
+        builder.addConstructorArgReference( BEAN_ID_POLYGENE_APPLICATION );
+        builder.addConstructorArgValue( serviceId );
+        AbstractBeanDefinition definition = builder.getBeanDefinition();
+
+        // Register service factory bean
+        BeanDefinitionRegistry definitionRegistry = aParserContext.getRegistry();
+        definitionRegistry.registerBeanDefinition( serviceId, definition );
+
+        return definition;
+    }
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/ZestServiceBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/ZestServiceBeanDefinitionParser.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/ZestServiceBeanDefinitionParser.java
deleted file mode 100644
index 7c9b5cc..0000000
--- a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/service/ZestServiceBeanDefinitionParser.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.spring.bootstrap.internal.service;
-
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-import static org.apache.polygene.library.spring.bootstrap.Constants.BEAN_ID_ZEST_APPLICATION;
-import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
-
-public final class PolygeneServiceBeanDefinitionParser
-    implements BeanDefinitionParser
-{
-    private static final String SERVICE_ID = "id";
-
-    @Override
-    public final BeanDefinition parse( Element anElement, ParserContext aParserContext )
-    {
-        String serviceId = anElement.getAttribute( SERVICE_ID );
-
-        // Service factory bean
-        BeanDefinitionBuilder builder = rootBeanDefinition( ServiceFactoryBean.class );
-        builder.addConstructorArgReference( BEAN_ID_ZEST_APPLICATION );
-        builder.addConstructorArgValue( serviceId );
-        AbstractBeanDefinition definition = builder.getBeanDefinition();
-
-        // Register service factory bean
-        BeanDefinitionRegistry definitionRegistry = aParserContext.getRegistry();
-        definitionRegistry.registerBeanDefinition( serviceId, definition );
-
-        return definition;
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyPolygeneBootstrapper.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyPolygeneBootstrapper.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyPolygeneBootstrapper.java
new file mode 100644
index 0000000..1aa3c8b
--- /dev/null
+++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyPolygeneBootstrapper.java
@@ -0,0 +1,50 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+package org.apache.polygene.library.spring;
+
+import org.apache.polygene.bootstrap.ApplicationAssembly;
+import org.apache.polygene.bootstrap.AssemblyException;
+import org.apache.polygene.library.spring.bootstrap.PolygeneApplicationBootstrap;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+// START SNIPPET: code
+public class MyPolygeneBootstrapper extends PolygeneApplicationBootstrap
+        implements ApplicationContextAware
+{
+    private ApplicationContext applicationContext;
+
+    @Override
+    public void assemble(ApplicationAssembly assembly) throws AssemblyException
+    {
+        // Normal assembly of an application.
+// END SNIPPET: code
+// START SNIPPET: code
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+
+}
+// END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyZestBootstrapper.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyZestBootstrapper.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyZestBootstrapper.java
deleted file mode 100644
index 1aa3c8b..0000000
--- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/MyZestBootstrapper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *
- */
-package org.apache.polygene.library.spring;
-
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.library.spring.bootstrap.PolygeneApplicationBootstrap;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-// START SNIPPET: code
-public class MyPolygeneBootstrapper extends PolygeneApplicationBootstrap
-        implements ApplicationContextAware
-{
-    private ApplicationContext applicationContext;
-
-    @Override
-    public void assemble(ApplicationAssembly assembly) throws AssemblyException
-    {
-        // Normal assembly of an application.
-// END SNIPPET: code
-// START SNIPPET: code
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
-    {
-        this.applicationContext = applicationContext;
-    }
-
-}
-// END SNIPPET: code

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java
new file mode 100644
index 0000000..7c5f447
--- /dev/null
+++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java
@@ -0,0 +1,59 @@
+/*
+ *  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.spring.bootstrap;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+import static org.apache.polygene.library.spring.bootstrap.PolygeneTestBootstrap.COMMENT_SERVICE_ID;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public final class PolygeneExportServiceTest
+{
+    @Autowired
+    private ApplicationContext appContext;
+
+    @Test
+    public final void testCommentService()
+    {
+        assertTrue( appContext.containsBean( COMMENT_SERVICE_ID ) );
+
+        CommentService commentService = (CommentService) appContext.getBean( COMMENT_SERVICE_ID );
+        assertNotNull( commentService );
+
+        String beerComment = commentService.comment( "beer" );
+        assertEquals( "BEER IS GOOD.", beerComment );
+
+        String colaComment = commentService.comment( "cola" );
+        assertEquals( "COLA IS GOOD.", colaComment );
+
+        String colaBeerComment = commentService.comment( "cola+beer" );
+        assertEquals( "COLA+BEER IS BAAAD.", colaBeerComment );
+
+        CommentServiceHolder holder = (CommentServiceHolder) appContext.getBean( "commentServiceHolder" );
+        assertTrue( commentService == holder.service() );
+    }
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneTestBootstrap.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneTestBootstrap.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneTestBootstrap.java
new file mode 100644
index 0000000..6cb12e0
--- /dev/null
+++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneTestBootstrap.java
@@ -0,0 +1,57 @@
+/*
+ *  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.spring.bootstrap;
+
+import org.apache.polygene.bootstrap.ApplicationAssembly;
+import org.apache.polygene.bootstrap.AssemblyException;
+import org.apache.polygene.bootstrap.LayerAssembly;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public final class PolygeneTestBootstrap extends PolygeneApplicationBootstrap
+        implements ApplicationContextAware
+{
+    private static final String LAYER = "layer";
+
+    private static final String MODULE = "module";
+
+    static final String COMMENT_SERVICE_ID = "commentService";
+
+    private static final String TO_UPPERCASE_SERVICE_ID = "toUppercaseService";
+
+    private ApplicationContext applicationContext;
+
+    public final void assemble( ApplicationAssembly applicationAssembly ) throws AssemblyException
+    {
+        LayerAssembly layerAssembly = applicationAssembly.layer( LAYER );
+        ModuleAssembly moduleAssembly = layerAssembly.module( MODULE );
+        moduleAssembly.services( CommentServiceComposite.class ).identifiedBy( COMMENT_SERVICE_ID );
+        // inject Spring bean as a service
+        moduleAssembly.importedServices( TextProcessingService.class )
+                .setMetaInfo( this.applicationContext.getBean( TO_UPPERCASE_SERVICE_ID ) );
+    }
+
+    public void setApplicationContext( ApplicationContext applicationContext ) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestExportServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestExportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestExportServiceTest.java
deleted file mode 100644
index 7c5f447..0000000
--- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestExportServiceTest.java
+++ /dev/null
@@ -1,59 +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.spring.bootstrap;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.junit.Assert.*;
-import static org.apache.polygene.library.spring.bootstrap.PolygeneTestBootstrap.COMMENT_SERVICE_ID;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public final class PolygeneExportServiceTest
-{
-    @Autowired
-    private ApplicationContext appContext;
-
-    @Test
-    public final void testCommentService()
-    {
-        assertTrue( appContext.containsBean( COMMENT_SERVICE_ID ) );
-
-        CommentService commentService = (CommentService) appContext.getBean( COMMENT_SERVICE_ID );
-        assertNotNull( commentService );
-
-        String beerComment = commentService.comment( "beer" );
-        assertEquals( "BEER IS GOOD.", beerComment );
-
-        String colaComment = commentService.comment( "cola" );
-        assertEquals( "COLA IS GOOD.", colaComment );
-
-        String colaBeerComment = commentService.comment( "cola+beer" );
-        assertEquals( "COLA+BEER IS BAAAD.", colaBeerComment );
-
-        CommentServiceHolder holder = (CommentServiceHolder) appContext.getBean( "commentServiceHolder" );
-        assertTrue( commentService == holder.service() );
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestTestBootstrap.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestTestBootstrap.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestTestBootstrap.java
deleted file mode 100644
index 86406fa..0000000
--- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/ZestTestBootstrap.java
+++ /dev/null
@@ -1,58 +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.spring.bootstrap;
-
-import org.apache.polygene.bootstrap.ApplicationAssembly;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.LayerAssembly;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-public final class PolygeneTestBootstrap
-        extends PolygeneApplicationBootstrap
-        implements ApplicationContextAware
-{
-    private static final String LAYER = "layer";
-
-    private static final String MODULE = "module";
-
-    static final String COMMENT_SERVICE_ID = "commentService";
-
-    private static final String TO_UPPERCASE_SERVICE_ID = "toUppercaseService";
-
-    private ApplicationContext applicationContext;
-
-    public final void assemble( ApplicationAssembly applicationAssembly ) throws AssemblyException
-    {
-        LayerAssembly layerAssembly = applicationAssembly.layer( LAYER );
-        ModuleAssembly moduleAssembly = layerAssembly.module( MODULE );
-        moduleAssembly.services( CommentServiceComposite.class ).identifiedBy( COMMENT_SERVICE_ID );
-        // inject Spring bean as a service
-        moduleAssembly.importedServices( TextProcessingService.class )
-                .setMetaInfo( this.applicationContext.getBean( TO_UPPERCASE_SERVICE_ID ) );
-    }
-
-    public void setApplicationContext( ApplicationContext applicationContext ) throws BeansException
-    {
-        this.applicationContext = applicationContext;
-    }
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java
new file mode 100644
index 0000000..74bbec4
--- /dev/null
+++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java
@@ -0,0 +1,118 @@
+/*
+ *  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.spring.importer;
+
+import java.util.stream.StreamSupport;
+import org.apache.polygene.api.activation.ActivationException;
+import org.apache.polygene.api.injection.scope.Service;
+import org.apache.polygene.api.injection.scope.Structure;
+import org.apache.polygene.api.service.ServiceFinder;
+import org.apache.polygene.api.service.ServiceReference;
+import org.apache.polygene.bootstrap.AssemblyException;
+import org.apache.polygene.bootstrap.ModuleAssembly;
+import org.apache.polygene.bootstrap.SingletonAssembler;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.apache.polygene.api.service.qualifier.ServiceQualifier.withId;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration
+public final class PolygeneImportServiceTest
+{
+    @Autowired ApplicationContext appContext;
+
+    @Service CommentService service;
+
+    @Test
+    public final void givenImportedSpringServicesWhenServiceIsInjectedThenUseSpringService()
+        throws ActivationException, AssemblyException
+    {
+        SingletonAssembler assembler = new SingletonAssembler()
+        {
+            public void assemble( ModuleAssembly module ) throws AssemblyException
+            {
+                module.objects( PolygeneImportServiceTest.class );
+                // START SNIPPET: import
+                new SpringImporterAssembler( appContext ).assemble( module );
+                // END SNIPPET: import
+            }
+        };
+
+        assembler.module().injectTo( this );
+
+        assertThat( "service can be called", service.comment( "beer" ), equalTo( "beer is good." ) );
+    }
+
+    @Service Iterable<ServiceReference<CommentService>> services;
+
+    @Test
+    public final void givenImportedSpringServicesWhenServicesAreInjectedThenCanIdentifyByName()
+        throws ActivationException, AssemblyException
+    {
+        SingletonAssembler assembler = new SingletonAssembler()
+        {
+            public void assemble( ModuleAssembly module ) throws AssemblyException
+            {
+                module.objects( PolygeneImportServiceTest.class );
+
+                new SpringImporterAssembler( appContext ).assemble( module );
+            }
+        };
+
+        assembler.module().injectTo(this);
+
+        CommentService service = StreamSupport.stream( services.spliterator(), false )
+                                              .filter( withId( "commentService2" ) )
+                                              .findFirst().map( ServiceReference::get ).orElse( null );
+        assertThat( "service with correct id has been selected", service.comment( "pizza" ), equalTo( "pizza is good." ) );
+    }
+
+    @Structure ServiceFinder finder;
+
+    @Test
+    public final void givenImportedSpringServicesWhenServicesAreFoundThenCanIdentifyByName()
+        throws ActivationException, AssemblyException
+    {
+        SingletonAssembler assembler = new SingletonAssembler()
+        {
+            public void assemble( ModuleAssembly module ) throws AssemblyException
+            {
+                module.objects( PolygeneImportServiceTest.class );
+
+                new SpringImporterAssembler( appContext ).assemble( module );
+            }
+        };
+
+        assembler.module().injectTo( this );
+
+        CommentService foundService = finder.findServices( CommentService.class )
+                                            .filter( withId( "commentService2" ) )
+                                            .findFirst().map( ServiceReference::get )
+                                            .orElse( null );
+        assertThat( "service with correct id has been selected", foundService.comment( "pizza" ), equalTo( "pizza is good." ) );
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/ZestImportServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/ZestImportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/ZestImportServiceTest.java
deleted file mode 100644
index 74bbec4..0000000
--- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/ZestImportServiceTest.java
+++ /dev/null
@@ -1,118 +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.spring.importer;
-
-import java.util.stream.StreamSupport;
-import org.apache.polygene.api.activation.ActivationException;
-import org.apache.polygene.api.injection.scope.Service;
-import org.apache.polygene.api.injection.scope.Structure;
-import org.apache.polygene.api.service.ServiceFinder;
-import org.apache.polygene.api.service.ServiceReference;
-import org.apache.polygene.bootstrap.AssemblyException;
-import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.bootstrap.SingletonAssembler;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.apache.polygene.api.service.qualifier.ServiceQualifier.withId;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration
-public final class PolygeneImportServiceTest
-{
-    @Autowired ApplicationContext appContext;
-
-    @Service CommentService service;
-
-    @Test
-    public final void givenImportedSpringServicesWhenServiceIsInjectedThenUseSpringService()
-        throws ActivationException, AssemblyException
-    {
-        SingletonAssembler assembler = new SingletonAssembler()
-        {
-            public void assemble( ModuleAssembly module ) throws AssemblyException
-            {
-                module.objects( PolygeneImportServiceTest.class );
-                // START SNIPPET: import
-                new SpringImporterAssembler( appContext ).assemble( module );
-                // END SNIPPET: import
-            }
-        };
-
-        assembler.module().injectTo( this );
-
-        assertThat( "service can be called", service.comment( "beer" ), equalTo( "beer is good." ) );
-    }
-
-    @Service Iterable<ServiceReference<CommentService>> services;
-
-    @Test
-    public final void givenImportedSpringServicesWhenServicesAreInjectedThenCanIdentifyByName()
-        throws ActivationException, AssemblyException
-    {
-        SingletonAssembler assembler = new SingletonAssembler()
-        {
-            public void assemble( ModuleAssembly module ) throws AssemblyException
-            {
-                module.objects( PolygeneImportServiceTest.class );
-
-                new SpringImporterAssembler( appContext ).assemble( module );
-            }
-        };
-
-        assembler.module().injectTo(this);
-
-        CommentService service = StreamSupport.stream( services.spliterator(), false )
-                                              .filter( withId( "commentService2" ) )
-                                              .findFirst().map( ServiceReference::get ).orElse( null );
-        assertThat( "service with correct id has been selected", service.comment( "pizza" ), equalTo( "pizza is good." ) );
-    }
-
-    @Structure ServiceFinder finder;
-
-    @Test
-    public final void givenImportedSpringServicesWhenServicesAreFoundThenCanIdentifyByName()
-        throws ActivationException, AssemblyException
-    {
-        SingletonAssembler assembler = new SingletonAssembler()
-        {
-            public void assemble( ModuleAssembly module ) throws AssemblyException
-            {
-                module.objects( PolygeneImportServiceTest.class );
-
-                new SpringImporterAssembler( appContext ).assemble( module );
-            }
-        };
-
-        assembler.module().injectTo( this );
-
-        CommentService foundService = finder.findServices( CommentService.class )
-                                            .filter( withId( "commentService2" ) )
-                                            .findFirst().map( ServiceReference::get )
-                                            .orElse( null );
-        assertThat( "service with correct id has been selected", foundService.comment( "pizza" ), equalTo( "pizza is good." ) );
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java
----------------------------------------------------------------------
diff --git a/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java
index edd75d8..3d2e9a2 100644
--- a/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java
+++ b/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java
@@ -32,7 +32,7 @@ import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 
 public class ExternalDataSourceTest
-        extends AbstractPolygeneTest
+    extends AbstractPolygeneTest
 {
 
     @Override

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java
index ceed35e..25be0f6 100644
--- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java
+++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java
@@ -19,6 +19,7 @@
  */
 package org.apache.polygene.library.uid.sequence;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.composite.TransientComposite;
 import org.apache.polygene.api.injection.scope.Service;
@@ -26,7 +27,6 @@ import org.apache.polygene.api.mixin.Mixins;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.library.uid.sequence.assembly.PersistingSequencingAssembler;
-import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java
index 1e1fdd1..e8f8f40 100644
--- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java
+++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java
@@ -19,6 +19,7 @@
  */
 package org.apache.polygene.library.uid.sequence;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.composite.TransientComposite;
 import org.apache.polygene.api.injection.scope.Service;
@@ -26,7 +27,6 @@ import org.apache.polygene.api.mixin.Mixins;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.library.uid.sequence.assembly.TransientSequencingAssembler;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java
index 60ccb75..af5a490 100644
--- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java
+++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java
@@ -19,6 +19,7 @@
  */
 package org.apache.polygene.library.uid.uuid;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.composite.TransientComposite;
 import org.apache.polygene.api.injection.scope.Service;
@@ -26,7 +27,6 @@ import org.apache.polygene.api.mixin.Mixins;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.library.uid.uuid.assembly.UuidServiceAssembler;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/manual/src/docs/tutorials/howto-depend-on-zest.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-depend-on-zest.txt b/manual/src/docs/tutorials/howto-depend-on-zest.txt
index 8b3901b..d71fd71 100644
--- a/manual/src/docs/tutorials/howto-depend-on-zest.txt
+++ b/manual/src/docs/tutorials/howto-depend-on-zest.txt
@@ -50,24 +50,24 @@ You simply declare dependencies on Polygene™ artifacts:
     <dependency>
         <groupId>org.apache.polygene.core</groupId>
         <artifactId>org.apache.polygene.core.bootstrap</artifactId>
-        <version>ZEST_VERSION</version>
+        <version>POLYGENE_VERSION</version>
     </dependency>
     <dependency>
         <groupId>org.apache.polygene.core</groupId>
         <artifactId>org.apache.polygene.core.runtime</artifactId>
-        <version>ZEST_VERSION</version>
+        <version>POLYGENE_VERSION</version>
         <scope>runtime</scope>
     </dependency>
     <dependency>
         <groupId>org.apache.polygene.core</groupId>
         <artifactId>org.apache.polygene.core.testsupport</artifactId>
-        <version>ZEST_VERSION</version>
+        <version>POLYGENE_VERSION</version>
         <scope>test</scope>
     </dependency>
 </dependencies>
 ----
 
-Where `ZEST_VERSION` is the Polygene™ version you want to use.
+Where `POLYGENE_VERSION` is the Polygene™ version you want to use.
 
 If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository:
 
@@ -91,13 +91,13 @@ You simply declare dependencies on Polygene™ artifacts:
 [source,groovy]
 ----
 dependencies {
-    compile     "org.apache.polygene.core:org.apache.polygene.core.bootstrap:ZEST_VERSION"
-    runtime     "org.apache.polygene.core:org.apache.polygene.core.runtime:ZEST_VERSION"
-    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:ZEST_VERSION"
+    compile     "org.apache.polygene.core:org.apache.polygene.core.bootstrap:POLYGENE_VERSION"
+    runtime     "org.apache.polygene.core:org.apache.polygene.core.runtime:POLYGENE_VERSION"
+    testCompile "org.apache.polygene.core:org.apache.polygene.core.testsupport:POLYGENE_VERSION"
 }
 ----
 
-Where `ZEST_VERSION` is the Polygene™ version you want to use.
+Where `POLYGENE_VERSION` is the Polygene™ version you want to use.
 
 If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository:
 
@@ -115,12 +115,12 @@ You simply declare dependencies on Polygene™ artifacts:
 
 [source,ruby]
 ----
-compile.with 'org.apache.polygene.core:org.apache.polygene.core.bootstrap:ZEST_VERSION'
-package(:war).with :libs => 'org.apache.polygene.core:org.apache.polygene.core.runtime:ZEST_VERSION'
-test.with 'org.apache.polygene.core:org.apache.polygene.core.testsupport:ZEST_VERSION'
+compile.with 'org.apache.polygene.core:org.apache.polygene.core.bootstrap:POLYGENE_VERSION'
+package(:war).with :libs => 'org.apache.polygene.core:org.apache.polygene.core.runtime:POLYGENE_VERSION'
+test.with 'org.apache.polygene.core:org.apache.polygene.core.testsupport:POLYGENE_VERSION'
 ----
 
-Where `ZEST_VERSION` is the Polygene™ version you want to use.
+Where `POLYGENE_VERSION` is the Polygene™ version you want to use.
 
 If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository:
 
@@ -137,17 +137,17 @@ You simply declare dependencies on Polygene™ artifacts:
 [source,scala]
 ----
 libraryDependencies += \
-    "org.apache.polygene.core" % "org.apache.polygene.core.bootstrap" % "ZEST_VERSION" \
+    "org.apache.polygene.core" % "org.apache.polygene.core.bootstrap" % "POLYGENE_VERSION" \
     withSources() withJavadoc()
 libraryDependencies += \
-    "org.apache.polygene.core" % "org.apache.polygene.core.runtime" % "ZEST_VERSION" % "runtime" \
+    "org.apache.polygene.core" % "org.apache.polygene.core.runtime" % "POLYGENE_VERSION" % "runtime" \
     withSources() withJavadoc()
 libraryDependencies += \
-    "org.apache.polygene.core" % "org.apache.polygene.core.testsupport" % "ZEST_VERSION" % "test" \
+    "org.apache.polygene.core" % "org.apache.polygene.core.testsupport" % "POLYGENE_VERSION" % "test" \
     withSources() withJavadoc()
 ----
 
-Where `ZEST_VERSION` is the Polygene™ version you want to use.
+Where `POLYGENE_VERSION` is the Polygene™ version you want to use.
 
 If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository:
 
@@ -166,16 +166,16 @@ You simply declare dependencies on Polygene™ artifacts:
 <ivy-module>
     <dependencies>
         <dependency org="org.apache.polygene.core" name="org.apache.polygene.core.bootstrap"
-                    rev="ZEST_VERSION"  conf="default" />
+                    rev="POLYGENE_VERSION"  conf="default" />
         <dependency org="org.apache.polygene.core" name="org.apache.polygene.core.runtime"
-                    rev="ZEST_VERSION"  conf="runtime" />
+                    rev="POLYGENE_VERSION"  conf="runtime" />
         <dependency org="org.apache.polygene.core" name="org.apache.polygene.core.testsupport"
-                    rev="ZEST_VERSION"  conf="test" />
+                    rev="POLYGENE_VERSION"  conf="test" />
     </dependencies>
 </ivy-module>
 ----
 
-Where `ZEST_VERSION` is the Polygene™ version you want to use.
+Where `POLYGENE_VERSION` is the Polygene™ version you want to use.
 
 If you want to use +-SNAPSHOT+ versions, you need to register the Apache Snapshots repository in a `ivysettings.xml` file:
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/manual/src/docs/tutorials/howto-releasing-apache.txt
----------------------------------------------------------------------
diff --git a/manual/src/docs/tutorials/howto-releasing-apache.txt b/manual/src/docs/tutorials/howto-releasing-apache.txt
index 2854c88..62dc155 100644
--- a/manual/src/docs/tutorials/howto-releasing-apache.txt
+++ b/manual/src/docs/tutorials/howto-releasing-apache.txt
@@ -164,14 +164,14 @@ They can be resolved by:
 - marking them as `INVALID` or `WONTFIX`
 - changing their fix version to another unreleased version
 
-See the https://issues.apache.org/jira/browse/ZEST[ZEST] project on JIRA.
+See the https://issues.apache.org/jira/browse/POLYGENE[POLYGENE] project on JIRA.
 
 
 === Prepare Release-Notes
 
 Apache Polygene™ release-notes are generated from JIRA issues.
 
-Open the target Polygene™ version's release-notes in https://issues.apache.org/jira/browse/ZEST/?selectedTab=com.atlassian.jira.jira-projects-plugin:roadmap-panel[JIRA] and review them.
+Open the target Polygene™ version's release-notes in https://issues.apache.org/jira/browse/POLYGENE/?selectedTab=com.atlassian.jira.jira-projects-plugin:roadmap-panel[JIRA] and review them.
 
 JIRA can produces release-notes as HTML or plain-text.
 Set it up to generate plain-text release-notes.
@@ -187,7 +187,7 @@ Convert to Asciidoc:
 [source,shell]
 ----
 cat "apache-polygene-java-<RELEASE-VERSION>-release-notes.txt" | \
-  sed -e "s/\[ZEST-\([0-9]\)*\]/https:\/\/issues.apache.org\/jira\/browse\/ZEST-\1[ZEST-\1]/" | \
+  sed -e "s/\[POLYGENE-\([0-9]\)*\]/https:\/\/issues.apache.org\/jira\/browse\/POLYGENE-\1[POLYGENE-\1]/" | \
   sed -e "s/    \* /- /" | sed -e "s/^\*\*/====/" \
   > "apache-polygene-java-<RELEASE-VERSION>-release-notes.adoc"
 ----
@@ -197,7 +197,7 @@ Convert to Markdown:
 [source,shell]
 ----
 cat "apache-polygene-java-<RELEASE-VERSION>-release-notes.txt" | \
-  sed -e "s/\[ZEST-\([0-9]*\)\]/[ZEST-\1](https:\/\/issues.apache.org\/jira\/browse\/ZEST-\1)/" | \
+  sed -e "s/\[POLYGENE-\([0-9]*\)\]/[POLYGENE-\1](https:\/\/issues.apache.org\/jira\/browse\/POLYGENE-\1)/" | \
   sed -e "s/    \* /- /" | sed -e "s/^\*\*/####/" \
   > "apache-polygene-java-<RELEASE-VERSION>-release-notes.md"
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tests/regression/README-for-regression-reporting.txt
----------------------------------------------------------------------
diff --git a/tests/regression/README-for-regression-reporting.txt b/tests/regression/README-for-regression-reporting.txt
index a558433..872a2ed 100644
--- a/tests/regression/README-for-regression-reporting.txt
+++ b/tests/regression/README-for-regression-reporting.txt
@@ -3,7 +3,7 @@ Regression Test reporting follows the following steps;
 
 1. Go to http://ops4j1.jira.com/browse/QI and create a new JIRA issue about the problem.
 
-2. Create a package named org.apache.polygene.tests.regression.qi123 (for QI-123) in $ZEST/tests/regression/src/main/java.
+2. Create a package named org.apache.polygene.tests.regression.qi123 (for QI-123) in $POLYGENE/tests/regression/src/main/java.
    NOTE: observe that the test MUST sit in the src/MAIN/java and not under src/test
 
 3. Create a JUnit or TestNG test capturing the issue described in JIRA.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/PolygeneApplicationComponent.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/PolygeneApplicationComponent.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/PolygeneApplicationComponent.java
new file mode 100644
index 0000000..42d1104
--- /dev/null
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/PolygeneApplicationComponent.java
@@ -0,0 +1,133 @@
+/*
+ *  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.ide.plugin.idea;
+
+import com.intellij.codeInspection.InspectionToolProvider;
+import com.intellij.facet.FacetTypeRegistry;
+import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
+import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor;
+import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory;
+import com.intellij.openapi.components.ApplicationComponent;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.apache.polygene.ide.plugin.idea.appliesTo.inspections.AppliesToAnnotationDeclaredCorrectlyInspection;
+import org.apache.polygene.ide.plugin.idea.common.facet.PolygeneFacetType;
+import org.apache.polygene.ide.plugin.idea.concerns.inspections.ConcernsAnnotationDeclaredCorrectlyInspection;
+import org.apache.polygene.ide.plugin.idea.injections.invocation.inspections.InvocationAnnotationDeclaredCorrectlyInspection;
+import org.apache.polygene.ide.plugin.idea.injections.service.inspections.ServiceAnnotationDeclaredCorrectlyInspection;
+import org.apache.polygene.ide.plugin.idea.injections.structure.inspections.StructureAnnotationDeclaredCorrectlyInspection;
+import org.apache.polygene.ide.plugin.idea.mixins.inspections.MixinImplementsMixinType;
+import org.apache.polygene.ide.plugin.idea.mixins.inspections.MixinsAnnotationDeclaredOnMixinType;
+import org.apache.polygene.ide.plugin.idea.sideEffects.inspections.SideEffectsAnnotationDeclaredCorrectlyInspection;
+
+import javax.swing.*;
+
+import static org.apache.polygene.ide.plugin.idea.common.resource.PolygeneResourceBundle.message;
+
+/**
+ * @author edward.yakop@gmail.com
+ * @since 0.1
+ */
+public final class PolygeneApplicationComponent
+    implements ApplicationComponent, InspectionToolProvider, FileTemplateGroupDescriptorFactory
+{
+    @NonNls
+    private static String[] FILE_TEMPLATES = {
+        "GenericConcernOf.java"
+    };
+
+    private final PolygeneFacetType polygeneFacetType;
+
+    public PolygeneApplicationComponent()
+    {
+        polygeneFacetType = new PolygeneFacetType();
+    }
+
+    @NotNull
+    public final String getComponentName()
+    {
+        return "PolygeneApplicationComponent";
+    }
+
+    public final void initComponent()
+    {
+        registerFacet();
+        registerIntentions();
+    }
+
+    private void registerFacet()
+    {
+        FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
+        facetTypeRegistry.registerFacetType( polygeneFacetType );
+    }
+
+    private void registerIntentions()
+    {
+//        IntentionManager intentionManager = IntentionManager.getInstance();
+//        intentionManager.registerIntentionAndMetaData( new AddConcernOnType(), "intention.category.control.flow" );
+    }
+
+    public final void disposeComponent()
+    {
+        unregisterFacet();
+    }
+
+    private void unregisterFacet()
+    {
+        FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
+        facetTypeRegistry.unregisterFacetType( polygeneFacetType );
+    }
+
+    public final Class[] getInspectionClasses()
+    {
+        return new Class[]{
+            // Concerns
+            ConcernsAnnotationDeclaredCorrectlyInspection.class,
+            // Mixins
+            MixinImplementsMixinType.class,
+            MixinsAnnotationDeclaredOnMixinType.class,
+            // Side effects
+            SideEffectsAnnotationDeclaredCorrectlyInspection.class,
+            // Injections
+            InvocationAnnotationDeclaredCorrectlyInspection.class,
+            ServiceAnnotationDeclaredCorrectlyInspection.class,
+            StructureAnnotationDeclaredCorrectlyInspection.class,
+            // AppliesTo
+            AppliesToAnnotationDeclaredCorrectlyInspection.class
+        };
+    }
+
+    public final FileTemplateGroupDescriptor getFileTemplatesDescriptor()
+    {
+        FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor(
+            message( "polygene.file.template.group.title" ), null
+        );
+
+        FileTypeManager fileTypeManager = FileTypeManager.getInstance();
+        for( @NonNls String template : FILE_TEMPLATES )
+        {
+            Icon icon = fileTypeManager.getFileTypeByFileName( template ).getIcon();
+            group.addTemplate( new FileTemplateDescriptor( template, icon ) );
+        }
+
+        return group;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
deleted file mode 100644
index 42d1104..0000000
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/ZestApplicationComponent.java
+++ /dev/null
@@ -1,133 +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.ide.plugin.idea;
-
-import com.intellij.codeInspection.InspectionToolProvider;
-import com.intellij.facet.FacetTypeRegistry;
-import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
-import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor;
-import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory;
-import com.intellij.openapi.components.ApplicationComponent;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.apache.polygene.ide.plugin.idea.appliesTo.inspections.AppliesToAnnotationDeclaredCorrectlyInspection;
-import org.apache.polygene.ide.plugin.idea.common.facet.PolygeneFacetType;
-import org.apache.polygene.ide.plugin.idea.concerns.inspections.ConcernsAnnotationDeclaredCorrectlyInspection;
-import org.apache.polygene.ide.plugin.idea.injections.invocation.inspections.InvocationAnnotationDeclaredCorrectlyInspection;
-import org.apache.polygene.ide.plugin.idea.injections.service.inspections.ServiceAnnotationDeclaredCorrectlyInspection;
-import org.apache.polygene.ide.plugin.idea.injections.structure.inspections.StructureAnnotationDeclaredCorrectlyInspection;
-import org.apache.polygene.ide.plugin.idea.mixins.inspections.MixinImplementsMixinType;
-import org.apache.polygene.ide.plugin.idea.mixins.inspections.MixinsAnnotationDeclaredOnMixinType;
-import org.apache.polygene.ide.plugin.idea.sideEffects.inspections.SideEffectsAnnotationDeclaredCorrectlyInspection;
-
-import javax.swing.*;
-
-import static org.apache.polygene.ide.plugin.idea.common.resource.PolygeneResourceBundle.message;
-
-/**
- * @author edward.yakop@gmail.com
- * @since 0.1
- */
-public final class PolygeneApplicationComponent
-    implements ApplicationComponent, InspectionToolProvider, FileTemplateGroupDescriptorFactory
-{
-    @NonNls
-    private static String[] FILE_TEMPLATES = {
-        "GenericConcernOf.java"
-    };
-
-    private final PolygeneFacetType polygeneFacetType;
-
-    public PolygeneApplicationComponent()
-    {
-        polygeneFacetType = new PolygeneFacetType();
-    }
-
-    @NotNull
-    public final String getComponentName()
-    {
-        return "PolygeneApplicationComponent";
-    }
-
-    public final void initComponent()
-    {
-        registerFacet();
-        registerIntentions();
-    }
-
-    private void registerFacet()
-    {
-        FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
-        facetTypeRegistry.registerFacetType( polygeneFacetType );
-    }
-
-    private void registerIntentions()
-    {
-//        IntentionManager intentionManager = IntentionManager.getInstance();
-//        intentionManager.registerIntentionAndMetaData( new AddConcernOnType(), "intention.category.control.flow" );
-    }
-
-    public final void disposeComponent()
-    {
-        unregisterFacet();
-    }
-
-    private void unregisterFacet()
-    {
-        FacetTypeRegistry facetTypeRegistry = FacetTypeRegistry.getInstance();
-        facetTypeRegistry.unregisterFacetType( polygeneFacetType );
-    }
-
-    public final Class[] getInspectionClasses()
-    {
-        return new Class[]{
-            // Concerns
-            ConcernsAnnotationDeclaredCorrectlyInspection.class,
-            // Mixins
-            MixinImplementsMixinType.class,
-            MixinsAnnotationDeclaredOnMixinType.class,
-            // Side effects
-            SideEffectsAnnotationDeclaredCorrectlyInspection.class,
-            // Injections
-            InvocationAnnotationDeclaredCorrectlyInspection.class,
-            ServiceAnnotationDeclaredCorrectlyInspection.class,
-            StructureAnnotationDeclaredCorrectlyInspection.class,
-            // AppliesTo
-            AppliesToAnnotationDeclaredCorrectlyInspection.class
-        };
-    }
-
-    public final FileTemplateGroupDescriptor getFileTemplatesDescriptor()
-    {
-        FileTemplateGroupDescriptor group = new FileTemplateGroupDescriptor(
-            message( "polygene.file.template.group.title" ), null
-        );
-
-        FileTypeManager fileTypeManager = FileTypeManager.getInstance();
-        for( @NonNls String template : FILE_TEMPLATES )
-        {
-            Icon icon = fileTypeManager.getFileTypeByFileName( template ).getIcon();
-            group.addTemplate( new FileTemplateDescriptor( template, icon ) );
-        }
-
-        return group;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
index 178d258..a6d0a38 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/common/inspections/AbstractInspection.java
@@ -32,11 +32,11 @@ import static com.intellij.codeHighlighting.HighlightDisplayLevel.ERROR;
  */
 public abstract class AbstractInspection extends BaseJavaLocalInspectionTool
 {
-    private static final String ZEST_IDEA_INSPECTIONS_NAME = "polygene.inspections.name";
+    private static final String POLYGENE_IDEA_INSPECTIONS_NAME = "polygene.inspections.name";
 
     @Nls @NotNull public String getGroupDisplayName()
     {
-        return PolygeneResourceBundle.message( ZEST_IDEA_INSPECTIONS_NAME );
+        return PolygeneResourceBundle.message( POLYGENE_IDEA_INSPECTIONS_NAME );
     }
 
     @NotNull

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ZestStructureAnnotationConstants.java
----------------------------------------------------------------------
diff --git a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ZestStructureAnnotationConstants.java b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ZestStructureAnnotationConstants.java
index 90dfd83..2a5d3bf 100644
--- a/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ZestStructureAnnotationConstants.java
+++ b/tools/qidea/src/main/java/org/apache/zest/ide/plugin/idea/injections/structure/common/ZestStructureAnnotationConstants.java
@@ -41,7 +41,7 @@ public final class PolygeneStructureAnnotationConstants
                 "org.apache.polygene.structure.Module",
                 "org.apache.polygene.structure.Layer",
                 "org.apache.polygene.structure.Application",
-                "org.apache.polygene.PolygeneAPI",
+                "org.apache.polygene.api.PolygeneAPI",
                 "org.apache.polygene.spi.PolygeneSPI"
             };
         sort( VALID_STRUCTURE_INJECTION_TYPE );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tools/shell/src/dist/bin/zest-boot
----------------------------------------------------------------------
diff --git a/tools/shell/src/dist/bin/zest-boot b/tools/shell/src/dist/bin/zest-boot
index 5a86955..5c0306a 100644
--- a/tools/shell/src/dist/bin/zest-boot
+++ b/tools/shell/src/dist/bin/zest-boot
@@ -59,7 +59,7 @@ else
     # Up one level
     cd ..
     # Get the home directory of Polygene
-    ZESTPATH=`pwd`
+    POLYGENEPATH=`pwd`
 
     # Figure out if we are executing from within the SDK or the QuickStart
     if [ -f libs/$JARNAME ] ; then
@@ -73,7 +73,7 @@ else
     # Restore the current directory
     cd $CWD
 
-    java -Dpolygene.home=$ZESTPATH -jar $ZESTPATH/$JARFILE "$@"
+    java -Dpolygene.home=$POLYGENEPATH -jar $POLYGENEPATH/$JARFILE "$@"
 fi
 
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
----------------------------------------------------------------------
diff --git a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
index e6f59e7..ac71082 100644
--- a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
+++ b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java
@@ -19,11 +19,11 @@
  */
 package org.apache.polygene.tutorials.cargo.step2;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.composite.TransientBuilder;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
----------------------------------------------------------------------
diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
index 46589ed..d752fdd 100644
--- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
+++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
@@ -19,11 +19,11 @@
  */
 package org.apache.polygene.tutorials.hello;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.value.ValueBuilder;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
----------------------------------------------------------------------
diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
index 72ae7ef..1ff59eb 100644
--- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
+++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java
@@ -21,13 +21,13 @@ package org.apache.polygene.tutorials.hello;
 
 import org.apache.polygene.api.identity.Identity;
 import org.apache.polygene.api.identity.StringIdentity;
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.api.entity.EntityBuilder;
 import org.apache.polygene.api.unitofwork.UnitOfWork;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.entitystore.memory.MemoryEntityStoreService;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step2/LibraryTest.java
----------------------------------------------------------------------
diff --git a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step2/LibraryTest.java b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step2/LibraryTest.java
index f8eaa7e..440b9bb 100644
--- a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step2/LibraryTest.java
+++ b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step2/LibraryTest.java
@@ -19,10 +19,10 @@
  */
 package org.apache.polygene.tutorials.services.step2;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 public class LibraryTest
     extends AbstractPolygeneTest

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step3/LibraryTest.java
----------------------------------------------------------------------
diff --git a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step3/LibraryTest.java b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step3/LibraryTest.java
index ef33f00..f3c0197 100644
--- a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step3/LibraryTest.java
+++ b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step3/LibraryTest.java
@@ -19,10 +19,10 @@
  */
 package org.apache.polygene.tutorials.services.step3;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 
 public class LibraryTest
     extends AbstractPolygeneTest

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step4/LibraryTest.java
----------------------------------------------------------------------
diff --git a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step4/LibraryTest.java b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step4/LibraryTest.java
index 02c648e..c62d14d 100644
--- a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step4/LibraryTest.java
+++ b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step4/LibraryTest.java
@@ -19,10 +19,10 @@
  */
 package org.apache.polygene.tutorials.services.step4;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 
 public class LibraryTest

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b02063bd/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step6/LibraryTest.java
----------------------------------------------------------------------
diff --git a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step6/LibraryTest.java b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step6/LibraryTest.java
index 562715d..b13b7da 100644
--- a/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step6/LibraryTest.java
+++ b/tutorials/services/src/test/java/org/apache/polygene/tutorials/services/step6/LibraryTest.java
@@ -19,10 +19,10 @@
  */
 package org.apache.polygene.tutorials.services.step6;
 
+import org.apache.polygene.test.AbstractPolygeneTest;
 import org.junit.Test;
 import org.apache.polygene.bootstrap.AssemblyException;
 import org.apache.polygene.bootstrap.ModuleAssembly;
-import org.apache.polygene.test.AbstractPolygeneTest;
 import org.apache.polygene.test.EntityTestAssembler;
 
 public class LibraryTest


Mime
View raw message