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 2015/06/15 02:37:41 UTC
[1/5] zest-qi4j git commit: Have to remove lang-jruby and
lang-beanshell due to Licensing restrictions of ASF.
Repository: zest-qi4j
Updated Branches:
refs/heads/develop e44fb652d -> 72e375eb6
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/README.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/README.txt b/libraries/lang-jruby/README.txt
new file mode 100644
index 0000000..4cb1b55
--- /dev/null
+++ b/libraries/lang-jruby/README.txt
@@ -0,0 +1,10 @@
+
+BeanShell is licensed under LGPL, and Apache Software Foundation
+doesn't allow the use of LGPL in Apache projects.
+
+Therefor, Apache Zest had to drop this library component, but
+it is still available for separate download at
+
+https://github.com/Qi4j/qi4j-sdk
+
+in the libraries/lang-beanshell directory.
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/build.gradle b/libraries/lang-jruby/build.gradle
deleted file mode 100644
index 0d1ecbb..0000000
--- a/libraries/lang-jruby/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-description = "Qi4j JRuby Library allows for Mixins to be implemented in JRuby scripts instead of directly in compiled Java."
-
-jar { manifest { name = "Qi4j Library - Scripting - JRuby" }}
-
-
-dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile( project( ':org.qi4j.libraries:org.qi4j.library.scripting' ))
- compile(libraries.jruby)
-
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
-
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
- testRuntime(libraries.logback)
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/dev-status.xml b/libraries/lang-jruby/dev-status.xml
deleted file mode 100644
index cefc98a..0000000
--- a/libraries/lang-jruby/dev-status.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
- <status>
- <!--none,early,beta,stable,mature-->
- <codebase>beta</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/zest-qi4j/blob/060bb358/libraries/lang-jruby/licenses/jruby.license
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/licenses/jruby.license b/libraries/lang-jruby/licenses/jruby.license
deleted file mode 100644
index 64b9511..0000000
--- a/libraries/lang-jruby/licenses/jruby.license
+++ /dev/null
@@ -1,60 +0,0 @@
-JRuby distributes some ruby modules which are distributed under Ruby
-license:
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <ma...@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see the file GPL), or the conditions below:
-
- 1. You may make and give away verbatim copies of the source form of the
- software without restriction, provided that you duplicate all of the
- original copyright notices and associated disclaimers.
-
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
-
- a) place your modifications in the Public Domain or otherwise
- make them Freely Available, such as by posting said
-modifications to Usenet or an equivalent medium, or by allowing
-the author to include your modifications in the software.
-
- b) use the modified software only within your corporation or
- organization.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
-
- a) distribute the binaries and library files of the software,
-together with instructions (in the manual page or equivalent)
-on where to get the original distribution.
-
- b) accompany the distribution with the machine-readable source of
-the software.
-
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
-
- d) make other distribution arrangements with the author.
-
- 4. You may modify and include the part of the software into any other
- software (possibly commercial). But some files in the distribution
- are not written by the author, so that they are not under these terms.
-
- For the list of those files and their copying conditions, see the
- file LEGAL.
-
- 5. The scripts and library files supplied as input to or produced as
- output from the software do not automatically fall under the
- copyright of the software, but belong to whomever generated them,
- and may be sold commercially, and may be aggregated with this
- software.
-
- 6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/docs/lang-jruby.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/docs/lang-jruby.txt b/libraries/lang-jruby/src/docs/lang-jruby.txt
deleted file mode 100644
index a7113c2..0000000
--- a/libraries/lang-jruby/src/docs/lang-jruby.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-[[library-script-jruby, JRuby Scripting Library]]
-= JRuby Scripting =
-
-[devstatus]
---------------
-source=libraries/lang-jruby/dev-status.xml
---------------
-
-The JRuby Scripting Library allows Mixin methods to be implemented in Ruby and loaded dynamically on first use.
-
-include::../../build/docs/buildinfo/artifact.txt[]
-
-The JRuby Scripting Library is a Generic mixin that implements interfaces by delegating to Ruby functions using JRuby. Each method in an interface is declared by a Ruby method in a file located in classpath with the name "<interface>.rb", where the interface name includes the package, and has "." replaced with "/".
-
-Example:
-
- org/qi4j/samples/hello/domain/HelloWorldSpeaker.rb
-
-That means that the HelloWorldSpeaker.rb file may be co-located with the class files in the same package. It is currently not supported to place the JRuby implementation of the mixin in a different package than the interface it implements.
-
-To use JRuby to implement the Mixin functionality for a given interface,
-simply declare the +JRubyMixin+ like any other mixin, either in the interface
-or at assembly time.
-
-[snippet,java]
-----
-source=libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/HelloSpeaker.java
-tag=mixin
-----
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/JRubyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/JRubyMixin.java b/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/JRubyMixin.java
deleted file mode 100644
index 9d4bd01..0000000
--- a/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/JRubyMixin.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2007 Rickard Öberg
- * Licensed 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.qi4j.lang.jruby;
-
-import java.io.*;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import org.jruby.*;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.internal.runtime.methods.CallConfiguration;
-import org.jruby.internal.runtime.methods.DynamicMethod;
-import org.jruby.javasupport.JavaEmbedUtils;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.Visibility;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.qi4j.api.common.AppliesTo;
-import org.qi4j.api.common.AppliesToFilter;
-import org.qi4j.api.composite.Composite;
-import org.qi4j.api.composite.TransientBuilderFactory;
-import org.qi4j.api.injection.scope.Service;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.injection.scope.This;
-import org.qi4j.api.property.Property;
-import org.qi4j.library.scripting.ScriptReloadable;
-
-/**
- * Generic mixin that implements interfaces by delegating to Ruby functions
- * using JRuby. Each method in an interface is declared by a Ruby method
- * in a file located in classpath with the name "<interface>.rb",
- * where the interface name includes the package, and has "." replaced with "/".
- * <p>
- * Example:
- * </p>
- * <pre><code>
- * org/qi4j/samples/hello/domain/HelloWorldSpeaker.rb
- * </code></pre>
- */
-@AppliesTo( JRubyMixin.AppliesTo.class )
-public class JRubyMixin
- implements InvocationHandler, ScriptReloadable
-{
- @This private Composite me;
-
- @Service private Ruby runtime;
-
- private Map<Class, IRubyObject> rubyObjects = new HashMap<Class, IRubyObject>();
-
- public static class AppliesTo
- implements AppliesToFilter
- {
-
- @Override
- public boolean appliesTo( Method method, Class compositeType, Class mixin, Class modelClass )
- {
- return getFunctionResoure( method ) != null;
- }
-
- }
-
- @Structure TransientBuilderFactory factory;
-
- @Override
- public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable
- {
- try
- {
- // Get Ruby object for declaring class of the method
- Class declaringClass = method.getDeclaringClass();
- IRubyObject rubyObject = rubyObjects.get( declaringClass );
-
- // If not yet created, create one
- if( rubyObject == null )
- {
- // Create object instance
- try
- {
- rubyObject = runtime.evalScriptlet( declaringClass.getSimpleName() + ".new()" );
- }
- catch( RaiseException e )
- {
- if( e.getException() instanceof RubyNameError )
- {
- // Initialize Ruby class
- String script = getFunction( method );
- runtime.evalScriptlet( script );
-
- // Try creating a Ruby instance again
- rubyObject = runtime.evalScriptlet( declaringClass.getSimpleName() + ".new()" );
- }
- else
- {
- throw e;
- }
- }
-
- // Set @this variable to Composite
- IRubyObject meRuby = JavaEmbedUtils.javaToRuby( runtime, me );
- RubyClass rubyClass = meRuby.getMetaClass();
- if( !rubyClass.isFrozen() )
- {
- SetterDynamicMethod setter = new SetterDynamicMethod( runtime.getObjectSpaceModule(), Visibility.PUBLIC, null );
- GetterDynamicMethod getter = new GetterDynamicMethod( runtime.getObjectSpaceModule(), Visibility.PUBLIC, null );
- Method[] compositeMethods = me.getClass().getInterfaces()[ 0 ].getMethods();
- for( Method compositeMethod : compositeMethods )
- {
- if( Property.class.isAssignableFrom( compositeMethod.getReturnType() ) )
- {
-
- rubyClass.addMethod( compositeMethod.getName() + "=", setter );
- rubyClass.addMethod( compositeMethod.getName(), getter );
- }
- }
- rubyClass.freeze( ThreadContext.newContext( runtime ) );
- }
-
- RubyObjectAdapter rubyObjectAdapter = JavaEmbedUtils.newObjectAdapter();
- rubyObjectAdapter.setInstanceVariable( rubyObject, "@this", meRuby );
- rubyObjects.put( declaringClass, rubyObject );
- }
-
- // Convert method arguments and invoke the method
- IRubyObject rubyResult;
- if( args != null )
- {
- IRubyObject[] rubyArgs = new IRubyObject[args.length];
- for( int i = 0; i < args.length; i++ )
- {
- Object arg = args[ i ];
- rubyArgs[ i ] = JavaEmbedUtils.javaToRuby( runtime, arg );
- }
- rubyResult = rubyObject.callMethod( runtime.getCurrentContext(), method.getName(), rubyArgs );
- }
- else
- {
- rubyResult = rubyObject.callMethod( runtime.getCurrentContext(), method.getName() );
- }
-
- // Convert result to Java
- Object result = JavaEmbedUtils.rubyToJava( runtime, rubyResult, method.getReturnType() );
- return result;
- }
- catch( Exception e )
- {
- e.printStackTrace();
- throw e;
- }
- }
-
- @Override
- public void reloadScripts()
- {
- rubyObjects.clear();
- }
-
- protected String getFunction( Method aMethod )
- throws IOException
- {
- URL scriptUrl = getFunctionResoure( aMethod );
-
- if( scriptUrl == null )
- {
- throw new IOException( "No script found for method " + aMethod.getName() );
- }
-
- InputStream in = scriptUrl.openStream();
- BufferedReader scriptReader = new BufferedReader( new InputStreamReader( in ) );
- String line;
- StringBuilder sb = new StringBuilder();
- while( ( line = scriptReader.readLine() ) != null )
- {
- sb.append( line ).append( "\n" );
- }
- return sb.toString();
- }
-
- protected static URL getFunctionResoure( Method method )
- {
- Class<?> declaringClass = method.getDeclaringClass();
- String classname = declaringClass.getName();
- String scriptFile = classname.replace( '.', File.separatorChar ) + ".rb";
- ClassLoader loader = declaringClass.getClassLoader();
- URL scriptUrl = loader.getResource( scriptFile );
- return scriptUrl;
- }
-
- private static class SetterDynamicMethod
- extends DynamicMethod
- {
- private SetterDynamicMethod( RubyModule rubyModule, Visibility visibility, CallConfiguration callConfiguration )
- {
- super( rubyModule, visibility, callConfiguration );
- }
-
- @Override
- public IRubyObject call( ThreadContext threadContext, IRubyObject iRubyObject, RubyModule rubyModule, String methodName, IRubyObject[] iRubyObjects, Block block )
- {
- String propertyName = methodName.substring( 0, methodName.length() - 1 );
- IRubyObject prop = iRubyObject.callMethod( threadContext, propertyName );
- prop.callMethod( threadContext, "set", iRubyObjects );
- return null;
- }
-
- @Override
- public DynamicMethod dup()
- {
- return this;
- }
-
- }
-
- private static class GetterDynamicMethod
- extends DynamicMethod
- {
- private GetterDynamicMethod( RubyModule rubyModule, Visibility visibility, CallConfiguration callConfiguration )
- {
- super( rubyModule, visibility, callConfiguration );
- }
-
- @Override
- public IRubyObject call( ThreadContext threadContext, IRubyObject iRubyObject, RubyModule rubyModule, String methodName, IRubyObject[] iRubyObjects, Block block )
- {
- try
- {
- String propertyName = methodName;
- Object thisComposite = JavaEmbedUtils.rubyToJava( iRubyObject.getRuntime(), iRubyObject, Object.class );
- Method propertyMethod = thisComposite.getClass().getMethod( propertyName );
- Property property = (Property) propertyMethod.invoke( thisComposite );
- Object propertyValue = property.get();
- IRubyObject prop = JavaEmbedUtils.javaToRuby( iRubyObject.getRuntime(), propertyValue );
- return prop;
- }
- catch( Exception e )
- {
- throw new RaiseException( new RubyNameError( iRubyObject.getRuntime(), iRubyObject.getMetaClass(), "Could not find property " + methodName ) );
- }
- }
-
- @Override
- public DynamicMethod dup()
- {
- return this;
- }
-
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/package.html
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/package.html b/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/package.html
deleted file mode 100644
index b42f7e3..0000000
--- a/libraries/lang-jruby/src/main/java/org/qi4j/lang/jruby/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
- <body>
- <h2>Ruby Language Support Library.</h2>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/HelloSpeaker.java
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/HelloSpeaker.java b/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/HelloSpeaker.java
deleted file mode 100644
index 1aa9641..0000000
--- a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/HelloSpeaker.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2007 Rickard Öberg
- * Licensed 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.qi4j.lang.jruby;
-
-import org.qi4j.api.mixin.Mixins;
-
-// START SNIPPET: mixin
-import org.qi4j.lang.jruby.JRubyMixin;
-
-@Mixins(JRubyMixin.class)
-public interface HelloSpeaker
-{
- void sayHello();
-}
-// END SNIPPET: mixin
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/JRubyMixinTest.java
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/JRubyMixinTest.java b/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/JRubyMixinTest.java
deleted file mode 100644
index 433d62f..0000000
--- a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/JRubyMixinTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.qi4j.lang.jruby;
-/*
- * Copyright 2007 Rickard Öberg
- * Licensed 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.jruby.Ruby;
-import org.junit.Assert;
-import org.junit.Test;
-import org.qi4j.api.service.importer.InstanceImporter;
-import org.qi4j.bootstrap.AssemblyException;
-import org.qi4j.bootstrap.ModuleAssembly;
-import org.qi4j.test.AbstractQi4jTest;
-
-public class JRubyMixinTest extends AbstractQi4jTest
-{
- public void assemble( ModuleAssembly module )
- throws AssemblyException
- {
- module.transients( MyDomainType.class ).withMixins( JRubyMixin.class );
-
- Ruby ruby = Ruby.newInstance();
- module.importedServices( Ruby.class ).importedBy( InstanceImporter.class ).setMetaInfo( ruby );
- }
-
- @Test
- public void testInvoke()
- throws Throwable
- {
- MyDomainType domain = module.newTransientBuilder( MyDomainType.class ).newInstance();
-
- Assert.assertEquals( "do1() in Ruby mixin.", domain.do1() );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/MyDomainType.java
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/MyDomainType.java b/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/MyDomainType.java
deleted file mode 100644
index 4e4d36c..0000000
--- a/libraries/lang-jruby/src/test/java/org/qi4j/lang/jruby/MyDomainType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.qi4j.lang.jruby;
-
-public interface MyDomainType
-{
- String do1();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb b/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb
deleted file mode 100644
index a3a8a52..0000000
--- a/libraries/lang-jruby/src/test/resources/org/qi4j/lang/jruby/MyDomainType.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 2007 Rickard Oberg
-# Licensed 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.
-#
-
-class MyDomainType
- def do1
- return "do1() in Ruby mixin."
- end
-end
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index f7a72ac..5dae8fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,10 +16,8 @@ include "core:functional",
'libraries:fileconfig',
'libraries:http',
'libraries:invocation-cache',
- 'libraries:lang-beanshell',
'libraries:lang-groovy',
'libraries:lang-javascript',
- 'libraries:lang-jruby',
'libraries:lang-scala',
'libraries:jmx',
'libraries:locking',
[5/5] zest-qi4j git commit: Removing CXF Library,
as it is very dated and we have no interest in maintain XML based
technologies.
Posted by ni...@apache.org.
Removing CXF Library, as it is very dated and we have no interest in maintain XML based technologies.
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/72e375eb
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/72e375eb
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/72e375eb
Branch: refs/heads/develop
Commit: 72e375eb65338302725c60370861c10d987d511e
Parents: d31b13c
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Mon Jun 15 08:37:16 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Mon Jun 15 08:37:16 2015 +0800
----------------------------------------------------------------------
libraries.gradle | 12 -
libraries/cxf/build.gradle | 27 --
libraries/cxf/dev-status.xml | 19 -
libraries/cxf/src/docs/cxf.txt | 13 -
.../java/org/qi4j/library/cxf/CxfAssembler.java | 33 --
.../java/org/qi4j/library/cxf/JaxWsCreator.java | 26 -
.../library/cxf/JaxWsServerFactoryInfo.java | 48 --
.../java/org/qi4j/library/cxf/JaxWsService.java | 128 -----
.../org/qi4j/library/cxf/NamespaceUtil.java | 55 ---
.../org/qi4j/library/cxf/Qi4jTypeCreator.java | 63 ---
.../qi4j/library/cxf/ValueCompositeCxfType.java | 483 -------------------
.../main/java/org/qi4j/library/cxf/package.html | 9 -
.../java/org/qi4j/library/cxf/HelloClient.java | 43 --
.../java/org/qi4j/library/cxf/HelloMain.java | 42 --
.../java/org/qi4j/library/cxf/HelloWorld.java | 28 --
.../org/qi4j/library/cxf/HelloWorldImpl.java | 54 ---
.../java/org/qi4j/library/cxf/Subscription.java | 34 --
.../test/java/org/qi4j/library/cxf/User.java | 34 --
.../org/qi4j/library/cxf/divs/DivPoint.java | 51 --
.../org/qi4j/library/cxf/divs/DivStream.java | 40 --
.../org/qi4j/library/cxf/divs/Dividends.java | 26 -
.../qi4j/library/cxf/divs/DividendsMain.java | 65 ---
.../qi4j/library/cxf/divs/DividendsTest.java | 139 ------
.../library/cxf/divs/ProjectedDividends.java | 117 -----
.../cxf/divs/ProjectedDividendsService.java | 25 -
settings.gradle | 1 -
tutorials/composites/build.gradle | 2 +-
27 files changed, 1 insertion(+), 1616 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index b9e8d50..3186bb8 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -26,7 +26,6 @@ def commonsCodecVersion = '1.8'
def commonsDbcpVersion = '1.4' // Should be moved to org.apache.tomcat:tomcat-jdbc:8.0.8
def commonsIoVersion = '2.4'
def commonsLangVersion = '2.6'
-def cxfVersion = '2.5.6' // 2.7.11 Unable to resolve dependencies! - 3.0.0 exists
def derbyVersion = '10.10.2.0'
def dnsJavaVersion = '2.1.6'
def ehcacheVersion = '2.8.3'
@@ -83,7 +82,6 @@ def voldemortVersion = '1.3.0'
def wicketVersion = '1.5.8' // 6.15.0 Samples fails to compile!
def wicketStatelessVersion = '1.5.0'
def woodstoxVersion = '4.4.0'
-def wsdl4jVersion = '1.6.3'
def yammerMetricsVersion = '2.2.0'
def antVersion = '1.9.4'
@@ -244,16 +242,6 @@ rootProject.ext {
commons_io: "commons-io:commons-io:$commonsIoVersion",
commons_lang: "commons-lang:commons-lang:$commonsLangVersion",
servlet_api: "javax.servlet:javax.servlet-api:$servletVersion",
- cxf_api: 'org.apache.cxf:cxf-api:' + cxfVersion,
- cxf_util: "org.apache.cxf:cxf-common-utilities:$cxfVersion",
- cxf_rt_core: "org.apache.cxf:cxf-rt-core:$cxfVersion",
- cxf_rt_soap: "org.apache.cxf:cxf-rt-bindings-soap:$cxfVersion",
- cxf_rt_jaxws: "org.apache.cxf:cxf-rt-frontend-jaxws:$cxfVersion",
- cxf_rt_aegis: "org.apache.cxf:cxf-rt-databinding-aegis:$cxfVersion",
- cxf_rt_local: "org.apache.cxf:cxf-rt-transports-local:$cxfVersion",
- cxf_rt_http: "org.apache.cxf:cxf-rt-transports-http:$cxfVersion",
- cxf_rt_http_jetty: "org.apache.cxf:cxf-rt-transports-http-jetty:$cxfVersion",
- wsdl4j: 'wsdl4j:wsdl4j:' + wsdl4jVersion,
http_client: "org.apache.httpcomponents:httpclient:$httpClientVersion",
woodstox: "org.codehaus.woodstox:woodstox-core-asl:$woodstoxVersion",
restlet_xml: "org.restlet.jee:org.restlet.ext.xml:$restletVersion",
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/cxf/build.gradle b/libraries/cxf/build.gradle
deleted file mode 100644
index 603396b..0000000
--- a/libraries/cxf/build.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-description = "Qi4j CXF Library integrates Apache CXF with Qi4j."
-
-jar { manifest { name = "Qi4j Library - CXF" }}
-
-dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile(libraries.cxf_api)
- compile(libraries.cxf_util)
- compile(libraries.cxf_rt_core)
- compile(libraries.cxf_rt_soap)
- compile(libraries.cxf_rt_jaxws)
- compile(libraries.cxf_rt_aegis)
- compile(libraries.cxf_rt_local)
- compile(libraries.wsdl4j)
- compile(libraries.woodstox)
-// compile('org.apache.ws.commons.schema:XmlSchema:' + xmlSchemaVersion)
-
- runtime(libraries.cxf_rt_http)
- runtime(libraries.cxf_rt_http_jetty)
-
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(libraries.http_client)
- testCompile(libraries.xmlunit)
-
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
- testRuntime(libraries.logback)
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/cxf/dev-status.xml b/libraries/cxf/dev-status.xml
deleted file mode 100644
index 654d3aa..0000000
--- a/libraries/cxf/dev-status.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
- <status>
- <!--none,early,beta,stable,mature-->
- <codebase>beta</codebase>
-
- <!-- none, brief, good, complete -->
- <documentation>none</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/zest-qi4j/blob/72e375eb/libraries/cxf/src/docs/cxf.txt
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/docs/cxf.txt b/libraries/cxf/src/docs/cxf.txt
deleted file mode 100644
index 58570ba..0000000
--- a/libraries/cxf/src/docs/cxf.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-[[library-cxf, CXF Library]]
-= CXF WebService =
-
-[devstatus]
---------------
-source=libraries/cxf/dev-status.xml
---------------
-
-CXF WebService Library
-
-NOTE: This Library has no documentation yet. Learn how to contribute in <<community-docs>>.
-
-include::../../build/docs/buildinfo/artifact.txt[]
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/CxfAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/CxfAssembler.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/CxfAssembler.java
deleted file mode 100644
index 23dd83f..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/CxfAssembler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import org.qi4j.bootstrap.Assemblers;
-import org.qi4j.bootstrap.AssemblyException;
-import org.qi4j.bootstrap.ModuleAssembly;
-
-public class CxfAssembler
- extends Assemblers.Visibility<CxfAssembler>
-{
- @Override
- public void assemble( ModuleAssembly module )
- throws AssemblyException
- {
- module.objects( Qi4jTypeCreator.class, ValueCompositeCxfType.class ).visibleIn( visibility() );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsCreator.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsCreator.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsCreator.java
deleted file mode 100644
index 46d0a07..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsCreator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-
-public interface JaxWsCreator
-{
- void initialize( JaxWsServerFactoryBean svrFactory );
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsServerFactoryInfo.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsServerFactoryInfo.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsServerFactoryInfo.java
deleted file mode 100644
index 62ee0d8..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsServerFactoryInfo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-/**
- * The JaxWsServerFactoryInfo is a metaInfo type to set to services that wants to be exposed as
- * WebServices. Additionally, the service must have a {@code Visibility} set to {@code application}
- * otherwise the Apache CXF extension will not be able to detect the presence of the service (assuming it is in a
- * higher layer).
- */
-public final class JaxWsServerFactoryInfo
-{
-
- private final JaxWsCreator initializer;
- private final String address;
-
- public JaxWsServerFactoryInfo( JaxWsCreator initializer, String address )
- {
- this.initializer = initializer;
- this.address = address;
- }
-
- public String address()
- {
- return address;
- }
-
- public JaxWsCreator initializer()
- {
- return initializer;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsService.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsService.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsService.java
deleted file mode 100644
index a66949a..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/JaxWsService.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import org.apache.cxf.aegis.AegisContext;
-import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.aegis.type.AbstractTypeCreator;
-import org.apache.cxf.aegis.type.TypeCreationOptions;
-import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.qi4j.api.activation.ActivatorAdapter;
-import org.qi4j.api.activation.Activators;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.injection.scope.Uses;
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.api.object.ObjectFactory;
-import org.qi4j.api.service.ServiceComposite;
-import org.qi4j.api.service.ServiceDescriptor;
-import org.qi4j.api.service.ServiceReference;
-import org.qi4j.api.structure.Module;
-
-import static org.qi4j.functional.Iterables.first;
-
-@Mixins( JaxWsService.JaxWsMixin.class )
-@Activators( JaxWsService.Activator.class )
-public interface JaxWsService extends ServiceComposite
-{
-
-
- void initializeJaxWsFactory();
-
- public static class Activator
- extends ActivatorAdapter<ServiceReference<JaxWsService>>
- {
-
- @Override
- public void afterActivation( ServiceReference<JaxWsService> activated )
- throws Exception
- {
- activated.get().initializeJaxWsFactory();
- }
-
- }
-
- public abstract static class JaxWsMixin
- implements JaxWsService
- {
- @Structure
- private Module module;
-
- @Structure
- private ObjectFactory obf;
-
- @Uses
- ServiceDescriptor descriptor;
-
- @Override
- public void initializeJaxWsFactory()
- {
- final JaxWsServerFactoryInfo info = descriptor.metaInfo( JaxWsServerFactoryInfo.class );
- AegisDatabinding dataBinding = new AegisDatabinding();
- createQi4jTypeCreator( dataBinding );
- JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
- svrFactory.setDataBinding( dataBinding );
- svrFactory.setServiceClass( first( descriptor.types() ) );
- svrFactory.setServiceBean( findThisService() );
- if( info != null )
- {
- svrFactory.setAddress( info.address() );
- JaxWsCreator creator = info.initializer();
- if( creator != null )
- {
- creator.initialize( svrFactory );
- }
- }
- else
- {
- svrFactory.setAddress( "http://localhost:9300/" + identity().get() );
- svrFactory.getInInterceptors().add( new LoggingInInterceptor() );
- svrFactory.getOutInterceptors().add( new LoggingOutInterceptor() );
- }
- svrFactory.create();
- }
-
- private void createQi4jTypeCreator( AegisDatabinding dataBinding )
- {
- Qi4jTypeCreator qi4jTypeCreator = obf.newObject( Qi4jTypeCreator.class );
-
- AegisContext aegisContext = dataBinding.getAegisContext();
- TypeMapping typeMapping = aegisContext.getTypeMapping();
- AbstractTypeCreator defaultCreator = (AbstractTypeCreator) typeMapping.getTypeCreator();
- TypeCreationOptions configuration = defaultCreator.getConfiguration();
- qi4jTypeCreator.setConfiguration( configuration );
- qi4jTypeCreator.setNextCreator( defaultCreator );
- qi4jTypeCreator.setTypeMapping( typeMapping );
- }
-
- private Object findThisService()
- {
- ServiceReference<?> reference = module.findService( first( descriptor.types()) );
- if( reference == null )
- {
- System.err.println( "Internal Error?? JaxWsService.findThisService()" );
- return null; // Should not be possible.
- }
- return reference.get();
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/NamespaceUtil.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/NamespaceUtil.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/NamespaceUtil.java
deleted file mode 100644
index 0d4e1c8..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/NamespaceUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import javax.xml.namespace.QName;
-
-/**
- *
- */
-public final class NamespaceUtil
-{
-
- private NamespaceUtil()
- {
- }
-
- public static QName convertJavaTypeToQName( Type type )
- {
- if( type instanceof Class )
- {
- Class<?> valueType = (Class<?>) type;
- String packageName = valueType.getPackage().getName();
- String className = valueType.getSimpleName();
- QName typeQName = new QName( "urn:qi4j:type:value:" + packageName, className );
- return typeQName;
- }
- else if( type instanceof ParameterizedType )
- {
- return convertJavaTypeToQName( ( (ParameterizedType) type ).getRawType() );
- }
- else
- {
- throw new UnsupportedOperationException(
- "Types that are not Class nor ParameterizedType are not yet supported:" + type );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/Qi4jTypeCreator.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/Qi4jTypeCreator.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/Qi4jTypeCreator.java
deleted file mode 100644
index 9c71d59..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/Qi4jTypeCreator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import org.apache.cxf.aegis.type.AbstractTypeCreator;
-import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.aegis.type.TypeClassInfo;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.structure.Module;
-import org.qi4j.api.util.Classes;
-import org.qi4j.api.value.ValueComposite;
-
-public class Qi4jTypeCreator extends AbstractTypeCreator
-{
- @Structure
- private Module module;
-
- @Override
- public TypeClassInfo createClassInfo( PropertyDescriptor pd )
- {
- return null;
- }
-
- @Override
- public AegisType createCollectionType( TypeClassInfo info )
- {
- return null;
- }
-
- @Override
- public AegisType createDefaultType( TypeClassInfo info )
- {
- if( ValueComposite.class.isAssignableFrom( Classes.RAW_CLASS.map( info.getType() ) ) )
- {
- return module.newObject( ValueCompositeCxfType.class, info.getType(), getTypeMapping() );
- }
- return nextCreator.createDefaultType( info );
- }
-
- @Override
- public TypeClassInfo createClassInfo( Method m, int index )
- {
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/ValueCompositeCxfType.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/ValueCompositeCxfType.java b/libraries/cxf/src/main/java/org/qi4j/library/cxf/ValueCompositeCxfType.java
deleted file mode 100644
index bd1fb58..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/ValueCompositeCxfType.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * Copyright (c) 2010, Niclas Hehdman. All Rights Reserved.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.xml.namespace.QName;
-import org.apache.cxf.aegis.Context;
-import org.apache.cxf.aegis.DatabindingException;
-import org.apache.cxf.aegis.type.AegisType;
-import org.apache.cxf.aegis.type.TypeMapping;
-import org.apache.cxf.aegis.type.collection.CollectionType;
-import org.apache.cxf.aegis.type.collection.MapType;
-import org.apache.cxf.aegis.xml.MessageReader;
-import org.apache.cxf.aegis.xml.MessageWriter;
-import org.apache.cxf.common.xmlschema.XmlSchemaUtils;
-import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.commons.schema.XmlSchemaAttribute;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
-import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.qi4j.api.Qi4j;
-import org.qi4j.api.association.Association;
-import org.qi4j.api.association.AssociationDescriptor;
-import org.qi4j.api.association.AssociationStateHolder;
-import org.qi4j.api.association.ManyAssociation;
-import org.qi4j.api.association.NamedAssociation;
-import org.qi4j.api.common.Optional;
-import org.qi4j.api.common.QualifiedName;
-import org.qi4j.api.composite.StateDescriptor;
-import org.qi4j.api.entity.EntityReference;
-import org.qi4j.api.entity.Identity;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.injection.scope.Uses;
-import org.qi4j.api.property.Property;
-import org.qi4j.api.property.PropertyDescriptor;
-import org.qi4j.api.structure.Module;
-import org.qi4j.api.util.Classes;
-import org.qi4j.api.value.NoSuchValueException;
-import org.qi4j.api.value.ValueBuilder;
-import org.qi4j.api.value.ValueComposite;
-import org.qi4j.api.value.ValueDescriptor;
-import org.qi4j.functional.Function;
-import org.qi4j.functional.Iterables;
-import org.qi4j.spi.Qi4jSPI;
-
-import static org.qi4j.functional.Iterables.first;
-
-public class ValueCompositeCxfType
- extends AegisType
-{
- @Structure
- private Module module;
-
- @Structure
- Qi4jSPI spi;
-
- public ValueCompositeCxfType( @Uses Type type, @Uses TypeMapping typeMapping )
- {
- setTypeMapping( typeMapping );
- setTypeClass( type );
- setSchemaType( NamespaceUtil.convertJavaTypeToQName( type ) );
- }
-
- @Override
- public Object readObject( final MessageReader reader, final Context context )
- throws DatabindingException
- {
- QName qname = getSchemaType();
- final String className = ( qname.getNamespaceURI() + "." + qname.getLocalPart() ).substring( 20 );
-
- // Read attributes
- ValueDescriptor descriptor = module.valueDescriptor( className );
- StateDescriptor stateDescriptor = descriptor.state();
- final Map<QualifiedName, Object> values = new HashMap<>();
- while( reader.hasMoreElementReaders() )
- {
- MessageReader childReader = reader.getNextElementReader();
- QName childName = childReader.getName();
- QualifiedName childQualifiedName = QualifiedName.fromClass( (Class) typeClass,
- childName.getLocalPart() );
- PropertyDescriptor propertyDescriptor = stateDescriptor.findPropertyModelByQualifiedName(
- childQualifiedName );
- Type propertyType = propertyDescriptor.type();
- AegisType type = getTypeMapping().getType( propertyType );
- Object value = type.readObject( childReader, context );
- values.put( childQualifiedName, value );
- }
-
- ValueBuilder<?> builder = module.newValueBuilderWithState(
- (Class<?>) typeClass,
- new Function<PropertyDescriptor, Object>()
- {
- @Override
- public Object map( PropertyDescriptor descriptor1 )
- {
- return values.get( descriptor1.qualifiedName() );
- }
- },
- new Function<AssociationDescriptor, EntityReference>()
- {
- @Override
- public EntityReference map( AssociationDescriptor descriptor )
- {
- Object value = values.get( descriptor.qualifiedName() );
- if( value == null )
- {
- return null;
- }
- return EntityReference.parseEntityReference( value.toString() );
- }
- },
- new Function<AssociationDescriptor, Iterable<EntityReference>>()
- {
- @Override
- public Iterable<EntityReference> map( AssociationDescriptor descriptor )
- {
- Object value = values.get( descriptor.qualifiedName() );
- if( value == null )
- {
- return Iterables.empty();
- }
- String[] ids = value.toString().split( "," );
- List<EntityReference> references = new ArrayList<>( ids.length );
- for( String id : ids )
- {
- references.add( EntityReference.parseEntityReference( id ) );
- }
- return references;
- }
- },
- new Function<AssociationDescriptor, Map<String, EntityReference>>()
- {
- @Override
- public Map<String, EntityReference> map( AssociationDescriptor descriptor )
- {
- Object value = values.get( descriptor.qualifiedName() );
- if( value == null )
- {
- return Collections.emptyMap();
- }
- String[] namedRefs = value.toString().split( "," );
- Map<String, EntityReference> references = new HashMap<>( namedRefs.length );
- for( String namedRef : namedRefs )
- {
- String[] splitted = namedRef.split( ":" );
- references.put( splitted[0], EntityReference.parseEntityReference( splitted[1] ) );
- }
- return references;
- }
- } );
-
- return builder.newInstance();
- }
-
- @Override
- public void writeObject( Object object, final MessageWriter writer, final Context context )
- throws DatabindingException
- {
- ValueComposite composite = (ValueComposite) object;
- writer.writeXsiType( NamespaceUtil.convertJavaTypeToQName(
- first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( composite ).types() ) ) );
- AssociationStateHolder state = spi.stateOf( composite );
- for( Property<?> property : state.properties() )
- {
- Object value = property.get();
- AegisType type = null;
- if( value instanceof ValueComposite )
- {
- ValueComposite compositeValue = (ValueComposite) value;
- type = getTypeMapping().getType( NamespaceUtil.convertJavaTypeToQName(
- first( Qi4j.FUNCTION_DESCRIPTOR_FOR.map( compositeValue ).types() ) ) );
- }
- else if( value != null )
- {
- type = getOrCreateNonQi4jType( value );
- }
-
- QName childName = new QName( "", spi.propertyDescriptorFor( property ).qualifiedName().name() );
- MessageWriter cwriter = writer.getElementWriter( childName );
- if( type != null )
- {
- type.writeObject( value, cwriter, context );
- }
- else
- {
-// cwriter.writeXsiNil();
- }
- cwriter.close();
- }
-
- AegisType type = getTypeMapping().getType( NamespaceUtil.convertJavaTypeToQName( String.class ) );
- for( Association<?> association : state.allAssociations() )
- {
- QName childName = new QName( "", spi.associationDescriptorFor( association ).qualifiedName().name() );
- MessageWriter cwriter = writer.getElementWriter( childName );
-
- if( association.get() != null )
- {
- type.writeObject( ( (Identity) association.get() ).identity().get(), cwriter, context );
- }
- cwriter.close();
- }
-
- for( ManyAssociation<?> association : state.allManyAssociations() )
- {
- QName childName = new QName( "", spi.associationDescriptorFor( association ).qualifiedName().name() );
- MessageWriter cwriter = writer.getElementWriter( childName );
-
- String ids = null;
- for( Object entity : association )
- {
- String id = EntityReference.entityReferenceFor( entity ).identity();
- if( ids != null )
- {
- ids += ",";
- }
- ids += id;
- }
- if( ids == null )
- {
- ids = "";
- }
- type.writeObject( ids, cwriter, context );
- cwriter.close();
- }
-
- for( NamedAssociation<?> association : state.allNamedAssociations() )
- {
- QName childName = new QName( "", spi.associationDescriptorFor( association ).qualifiedName().name() );
- MessageWriter cwriter = writer.getElementWriter( childName );
-
- String ids = null;
- for( String name : association )
- {
- String id = EntityReference.entityReferenceFor( association.get( name ) ).identity();
- if( ids != null )
- {
- ids += ",";
- }
- ids += name + ":" + id;
- }
- if( ids == null )
- {
- ids = "";
- }
- type.writeObject( ids, cwriter, context );
- cwriter.close();
- }
- }
-
- private AegisType getOrCreateNonQi4jType( Object value )
- {
- AegisType type;
- TypeMapping mapping = getTypeMapping();
- Class<?> javaType = value.getClass();
- type = mapping.getType( javaType );
- if( type == null )
- {
- // This might be wrong and instead the ultimate top parent should be used. This works, since
- // we know that we are the top parent.
- type = getTypeMapping().getTypeCreator().createType( javaType );
- mapping.register( type );
- }
- return type;
- }
-
- @Override
- public void writeSchema( XmlSchema root )
- {
- XmlSchemaComplexType complex = new XmlSchemaComplexType( root, true );
- complex.setName( getSchemaType().getLocalPart() );
- root.getItems().add( complex );
-
- XmlSchemaSequence sequence = new XmlSchemaSequence(); // No clue why this?
- complex.setParticle( sequence ); // No idea what this is for
-
- ValueDescriptor descriptor = module.valueDescriptor( getTypeClass().getName() );
-
- for( PropertyDescriptor p : descriptor.state().properties() )
- {
- if( isValueComposite( p.type() ) )
- {
- XmlSchemaElement element = new XmlSchemaElement( root, false );
- element.setName( p.qualifiedName().name() );
- element.setNillable( p.metaInfo( Optional.class ) != null ); // see below
- sequence.getItems().add( element );
- AegisType nested = getOrCreateAegisType( p.type(), root );
- element.setSchemaTypeName( nested.getSchemaType() );
- }
- else if( isCollectionOrMap( p ) )
- {
- XmlSchemaElement element = new XmlSchemaElement( root, false );
- element.setName( p.qualifiedName().name() );
- element.setNillable( p.metaInfo( Optional.class ) != null ); // see below
- sequence.getItems().add( element );
- AegisType nested = getOrCreateAegisType( p.type(), root );
- element.setSchemaTypeName( nested.getSchemaType() );
- }
- else
- {
- XmlSchemaAttribute attribute = new XmlSchemaAttribute( root, false );
- complex.getAttributes().add( attribute );
- attribute.setName( p.qualifiedName().name() );
- AegisType nested = getTypeMapping().getType( p.type() );
- attribute.setSchemaTypeName( nested.getSchemaType() );
- }
- QName name = NamespaceUtil.convertJavaTypeToQName( p.type() );
- String ns = name.getNamespaceURI();
- if( !ns.equals( root.getTargetNamespace() ) )
- {
- XmlSchemaUtils.addImportIfNeeded( root, ns );
- }
- }
- }
-
- private AegisType getOrCreateAegisType( Type type, XmlSchema root )
- {
- AegisType nested = getTypeMapping().getType( type );
- if( nested == null )
- {
- nested = createType( type, root );
- nested.writeSchema( root );
- }
- return nested;
- }
-
- private AegisType createType( Type type, XmlSchema root )
- {
- if( isCollection( type ) )
- {
- AegisType componentType = getOrCreateAegisType( getCollectionComponentType( type ), root );
- CollectionType resultType = new CollectionType( componentType );
- QName schemaType = new QName( "http://www.w3.org/2001/XMLSchema", "list" );
- resultType.setSchemaType( schemaType );
- return resultType;
- }
- else if( isMap( type ) )
- {
- AegisType keyType = getOrCreateAegisType( getMapKeyComponentType( type ), root );
- AegisType valueType = getOrCreateAegisType( getMapValueComponentType( type ), root );
- QName schemaType = new QName( Classes.toURI( Classes.RAW_CLASS.map( type ) ), "map" );
- return new MapType( schemaType, keyType, valueType );
- }
- else if( isValueComposite( type ) )
- {
- ValueCompositeCxfType aegisType = module.newObject( ValueCompositeCxfType.class, getTypeMapping(), type );
- getTypeMapping().register( aegisType );
- return aegisType;
- }
- else
- {
- throw new NoSuchValueException( type.toString(), module.name() );
- }
- }
-
- private boolean isCollectionOrMap( final PropertyDescriptor p )
- {
- Type type = p.type();
- return isCollectionOrMap( type );
- }
-
- private boolean isCollection( Type type )
- {
- if( isCollectionClass( type ) )
- {
- return true;
- }
- if( type instanceof ParameterizedType )
- {
- ParameterizedType param = (ParameterizedType) type;
- Type rawType = param.getRawType();
- if( isCollectionClass( rawType ) )
- {
- return true;
- }
- }
- return false;
- }
-
- private boolean isMap( Type type )
- {
- if( isMapClass( type ) )
- {
- return true;
- }
- if( type instanceof ParameterizedType )
- {
- ParameterizedType param = (ParameterizedType) type;
- Type rawType = param.getRawType();
- if( isCollectionClass( rawType ) )
- {
- return true;
- }
- }
- return false;
- }
-
- private boolean isCollectionOrMap( Type type )
- {
- return isMap( type ) || isCollection( type );
- }
-
- @SuppressWarnings( "raw" )
- private boolean isCollectionClass( Type type )
- {
- if( type instanceof Class )
- {
- Class clazz = (Class) type;
- return Collection.class.isAssignableFrom( clazz );
- }
- return false;
- }
-
- @SuppressWarnings( "raw" )
- private boolean isMapClass( Type type )
- {
- if( type instanceof Class )
- {
- Class clazz = (Class) type;
- return Map.class.isAssignableFrom( clazz );
- }
- return false;
- }
-
- private Type getCollectionComponentType( Type p )
- {
- return getActualTypeArgument( p, 0 );
- }
-
- private Type getMapKeyComponentType( Type p )
- {
- return getActualTypeArgument( p, 0 );
- }
-
- private Type getMapValueComponentType( Type p )
- {
- return getActualTypeArgument( p, 1 );
- }
-
- private Type getActualTypeArgument( Type p, int index )
- {
- if( p instanceof ParameterizedType )
- {
- ParameterizedType type = (ParameterizedType) p;
- return type.getActualTypeArguments()[index];
- }
- return null;
- }
-
- @SuppressWarnings( "raw" )
- private boolean isValueComposite( Type type )
- {
- Class clazz = Classes.RAW_CLASS.map( type );
- ValueDescriptor descriptor = module.valueDescriptor( clazz.getName() );
- return descriptor != null;
- }
-
- @Override
- public boolean isComplex()
- {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/main/java/org/qi4j/library/cxf/package.html
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/main/java/org/qi4j/library/cxf/package.html b/libraries/cxf/src/main/java/org/qi4j/library/cxf/package.html
deleted file mode 100644
index 56ced64..0000000
--- a/libraries/cxf/src/main/java/org/qi4j/library/cxf/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
- <body>
- <h2>CXF Library.</h2>
- <p>
- The CXF Library defines Value-to-Soap type converter and also simplifies the set up of CXF in a Qi4j
- environment.
- </p>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloClient.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloClient.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloClient.java
deleted file mode 100644
index a0f27b3..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-
-public final class HelloClient
-{
- private HelloClient()
- {
- }
-
- public static void main( String[] args )
- {
- JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.getInInterceptors().add( new LoggingInInterceptor() );
- factory.getOutInterceptors().add( new LoggingOutInterceptor() );
- factory.setServiceClass( HelloWorld.class );
- factory.setAddress( "http://localhost:9001/helloWorld" );
- HelloWorld client = (HelloWorld) factory.create();
-
- String reply = client.sayHi( "World" );
- System.out.println( "Server said: " + reply );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloMain.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloMain.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloMain.java
deleted file mode 100644
index d3e883b..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloMain.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-
-public final class HelloMain
-{
- private HelloMain()
- {
- }
-
- public static void main( String[] args )
- {
- HelloWorldImpl implementor = new HelloWorldImpl();
- JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
- svrFactory.setServiceClass( HelloWorld.class );
- svrFactory.setAddress( "http://localhost:9001/helloWorld" );
- svrFactory.setServiceBean( implementor );
- svrFactory.getInInterceptors().add( new LoggingInInterceptor() );
- svrFactory.getOutInterceptors().add( new LoggingOutInterceptor() );
- svrFactory.create();
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorld.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorld.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorld.java
deleted file mode 100644
index 521df29..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorld.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-@WebService
-public interface HelloWorld
-{
- String sayHi( @WebParam( name = "text" ) String text );
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorldImpl.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorldImpl.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorldImpl.java
deleted file mode 100644
index ba236a5..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/HelloWorldImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.jws.WebService;
-
-@WebService( endpointInterface = "org.qi4j.library.cxf.HelloWorld",
- serviceName = "HelloWorld" )
-public class HelloWorldImpl implements HelloWorld
-{
- private final Map<Integer, User> users;
-
- public HelloWorldImpl()
- {
- users = new LinkedHashMap<>();
- }
-
- public String sayHi( String text )
- {
- System.out.println( "sayHi called" );
- return "Hello " + text;
- }
-
- public String sayHiToUser( User user )
- {
- System.out.println( "sayHiToUser called" );
- users.put( users.size() + 1, user );
- return "Hello " + user.getName();
- }
-
- public Map<Integer, User> getUsers()
- {
- System.out.println( "getUsers called" );
- return users;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/Subscription.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/Subscription.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/Subscription.java
deleted file mode 100644
index cdd7e99..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/Subscription.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-public class Subscription
-{
- private String key;
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/User.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/User.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/User.java
deleted file mode 100644
index ff3c6d1..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/User.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf;
-
-public class User
-{
- private String name;
-
- public void setName( String name )
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivPoint.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivPoint.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivPoint.java
deleted file mode 100644
index 147f490..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivPoint.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import org.qi4j.api.property.Property;
-import org.qi4j.api.value.ValueComposite;
-
-public interface DivPoint extends ValueComposite
-{
- Property<String> dt();
-
- Property<String> val();
-
- Property<String> valCcy();
-
- Property<String> divType();
-
- Property<String> recType();
-
- Property<String> net();
-
- Property<String> netCcy();
-
- Property<String> recDate();
-
- Property<String> paydate();
-
- Property<String> divTypeCD();
-
- Property<String> comment();
-
- Property<String> updateTS();
-
- Property<String> lastUpdater();
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivStream.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivStream.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivStream.java
deleted file mode 100644
index 221ec4d..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DivStream.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import java.util.List;
-import org.qi4j.api.property.Property;
-import org.qi4j.api.value.ValueComposite;
-
-public interface DivStream extends ValueComposite
-{
- Property<String> mdSymbol();
-
- Property<String> streamName();
-
- Property<String> consolidate();
-
- Property<String> issueId();
-
- Property<String> systemUpdateTS();
-
- Property<String> userUpdateTS();
-
- Property<List<DivPoint>> divPoints();
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/Dividends.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/Dividends.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/Dividends.java
deleted file mode 100644
index 9eb8a88..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/Dividends.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import org.qi4j.api.property.Property;
-
-public interface Dividends
-{
- Property<DivStream> divStream();
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsMain.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsMain.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsMain.java
deleted file mode 100644
index 4e2458f..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsMain.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import org.qi4j.api.structure.Application;
-import org.qi4j.bootstrap.AssemblyException;
-import org.qi4j.bootstrap.ModuleAssembly;
-import org.qi4j.bootstrap.SingletonAssembler;
-import org.qi4j.library.cxf.CxfAssembler;
-
-public final class DividendsMain
-{
- private DividendsMain()
- {
- }
-
- public static void main( String[] args )
- throws Exception
- {
- SingletonAssembler assembler = new SingletonAssembler()
- {
-
- public void assemble( ModuleAssembly module )
- throws AssemblyException
- {
- module.services( ProjectedDividendsService.class ).instantiateOnStartup();
- module.values( DivStream.class, DivPoint.class );
- new CxfAssembler().assemble( module );
- }
- };
- final Application application = assembler.application();
- Runtime.getRuntime().addShutdownHook( new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- application.passivate();
- }
- catch( Exception e )
- {
- System.err.println( "Problem shutting down Qi4j" );
- e.printStackTrace();
- }
- }
- } );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsTest.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsTest.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsTest.java
deleted file mode 100644
index 19e4c42..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/DividendsTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Date;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import org.custommonkey.xmlunit.XMLAssert;
-
-public class DividendsTest
-{
- private static final String EXPECTED =
- "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
- "<soap:Body><ns1:DSDataResponse xmlns:ns1=\"http://divs.cxf.library.qi4j.org/\">" +
- "<ns1:Snapshot>" +
- "<ns1:entry>" +
- "<ns1:key>bt.l/PRIVATE_niclas</ns1:key>" +
- "<ns1:value xmlns:ns2=\"urn:qi4j:type:value:org.qi4j.library.cxf.divs\" " +
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"ns2:DivStream\">" +
- "<issueId>PC10YZNZC100</issueId>" +
- "<divPoints>" +
- "<ns3:anyType xmlns:ns3=\"http://cxf.apache.org/arrays\" xsi:type=\"ns2:DivPoint\">" +
- "<updateTS>" + new Date( 2010, 10, 10 ).toString() + "</updateTS>" +
- "<divTypeCD></divTypeCD>" +
- "<valCcy>USD</valCcy>" +
- "<recType>A</recType>" +
- "<val>0.708</val>" +
- "<dt>2010-02-12</dt>" +
- "<net>0.637200003862381</net>" +
- "<netCcy>USD</netCcy>" +
- "<paydate>2017-09-19</paydate>" +
- "<recDate>2014-06-16</recDate>" +
- "<divType>REG</divType>" +
- "<comment>Silly comment</comment>" +
- "<lastUpdater>niclas</lastUpdater>" +
- "</ns3:anyType>" +
- "<ns3:anyType xmlns:ns3=\"http://cxf.apache.org/arrays\" xsi:type=\"ns2:DivPoint\">" +
- "<updateTS>" + new Date( 2010, 10, 10 ).toString() + "</updateTS>" +
- "<divTypeCD></divTypeCD>" +
- "<valCcy>USD</valCcy>" +
- "<recType>A</recType>" +
- "<val>3.068</val>" +
- "<dt>2020-02-22</dt>" +
- "<net>2.7612000703811646</net>" +
- "<netCcy>USD</netCcy>" +
- "<paydate>2027-09-10</paydate>" +
- "<recDate>2024-06-26</recDate>" +
- "<divType>REG</divType>" +
- "<comment>Silly comment</comment>" +
- "<lastUpdater>niclas</lastUpdater>" +
- "</ns3:anyType>" +
- "</divPoints>" +
- "<systemUpdateTS>" + new Date( 2010, 10, 10 ).toString() + "</systemUpdateTS>" +
- "<streamName>PRIVATE_niclas</streamName>" +
- "<userUpdateTS>" + new Date( 2010, 10, 10 ).toString() + "</userUpdateTS>" +
- "<consolidate>N</consolidate>" +
- "<mdSymbol>bt.l</mdSymbol>" +
- "</ns1:value>" +
- "</ns1:entry>" +
- "</ns1:Snapshot>" +
- "</ns1:DSDataResponse>" +
- "</soap:Body>" +
- "</soap:Envelope>";
-
- @Test
- public void whenRequestQi4jValueExpectCorrectResult()
- throws Exception
- {
- DividendsMain.main( new String[ 0 ] ); // Start server;
-
- HttpClient httpclient = new DefaultHttpClient();
- HttpPost httpPost = new HttpPost( "http://localhost:9300/ProjectedDividendsService" );
- httpPost.setHeader( "SOAPAction", "\"DSDataRequest\"" );
- httpPost.setHeader( "Content-Type", "text/xml;charset=UTF-8" );
- HttpEntity data = new StringEntity(
- "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
- "xmlns:divs=\"http://divs.cxf.library.qi4j.org/\" " +
- "xmlns:cxf=\"http://cxf.library.qi4j.org\">\n" +
- " <soapenv:Header/>\n" +
- " <soapenv:Body>\n" +
- " <divs:DSData>\n" +
- " <!--Optional:-->\n" +
- " <divs:RequestType>?</divs:RequestType>\n" +
- " <!--Optional:-->\n" +
- " <divs:DataService>?</divs:DataService>\n" +
- " <!--Optional:-->\n" +
- " <divs:Subscription>\n" +
- " <!--Optional:-->\n" +
- " <cxf:key>?</cxf:key>\n" +
- " </divs:Subscription>\n" +
- " </divs:DSData>\n" +
- " </soapenv:Body>\n" +
- "</soapenv:Envelope>" );
- httpPost.setEntity( data );
- HttpResponse response = httpclient.execute( httpPost );
- HttpEntity entity = response.getEntity();
- String result = "";
- if( entity != null )
- {
- InputStream instream = entity.getContent();
- InputStreamReader isr = new InputStreamReader( instream );
- BufferedReader br = new BufferedReader( isr );
- String line = br.readLine();
- while( line != null )
- {
- result = result + line;
- line = br.readLine();
- }
- }
- XMLAssert.assertXMLEqual( EXPECTED, result );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividends.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividends.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividends.java
deleted file mode 100644
index 6736b69..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividends.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.api.value.ValueBuilder;
-import org.qi4j.api.value.ValueBuilderFactory;
-import org.qi4j.library.cxf.Subscription;
-
-@WebService
-@Mixins( ProjectedDividends.ProjectedDividendsMixin.class )
-public interface ProjectedDividends
-{
- @WebMethod( action = "DSDataRequest", operationName = "DSData" )
- @WebResult( name = "Snapshot" )
- Map<String, DivStream> getSnapshot(
- @WebParam( name = "RequestType" ) String requestType,
- @WebParam( name = "DataService" ) String dataService,
- @WebParam( name = "Subscription" ) Subscription subscription
- );
-
- public class ProjectedDividendsMixin
- implements ProjectedDividends
- {
- private static final double NINETY_PERCENT = 0.9;
- private static final float BASE_OFFSET = 0.236f;
-
- @Structure
- private ValueBuilderFactory vbf;
-
- private int counter;
-
- public Map<String, DivStream> getSnapshot( String requestType, String dataService, Subscription subscription )
- {
- HashMap<String, DivStream> result = new HashMap<String, DivStream>();
- result.put( "bt.l/PRIVATE_niclas", createDivStream() );
- return result;
- }
-
- private DivStream createDivStream()
- {
- ValueBuilder<DivStream> builder = vbf.newValueBuilder( DivStream.class );
- DivStream prototype = builder.prototype();
- List<DivPoint> divPoints = new ArrayList<DivPoint>();
- for( int i = 0; i < 2; i++ )
- {
- divPoints.add( createDivPoint() );
- }
- prototype.divPoints().set( divPoints );
- prototype.consolidate().set( "N" );
- prototype.streamName().set( "PRIVATE_niclas" );
- prototype.systemUpdateTS().set( new Date( 2010, 10, 10 ).toString() );
- prototype.userUpdateTS().set( new Date( 2010, 10, 10 ).toString() );
- prototype.issueId().set( "PC10YZNZC100" );
- prototype.mdSymbol().set( "bt.l" );
- return builder.newInstance();
- }
-
- private DivPoint createDivPoint()
- {
- ValueBuilder<DivPoint> builder = vbf.newValueBuilder( DivPoint.class );
- DivPoint prototype = builder.prototype();
- prototype.comment().set( "Silly comment " );
- prototype.dt().set( createRandomDate() );
- float amount = randomAmount();
- prototype.val().set( "" + amount );
- prototype.valCcy().set( "USD" );
- prototype.divType().set( "REG" );
- prototype.recType().set( "A" );
- prototype.net().set( "" + ( amount * NINETY_PERCENT ) );
- prototype.netCcy().set( "USD" );
- prototype.recDate().set( createRandomDate() );
- prototype.paydate().set( createRandomDate() );
- prototype.divTypeCD().set( "" );
- prototype.comment().set( "Silly comment" );
- prototype.updateTS().set( new Date( 2010, 10, 10 ).toString() );
- prototype.lastUpdater().set( "niclas" );
- return builder.newInstance();
- }
-
- private float randomAmount()
- {
- return BASE_OFFSET * counter++;
- }
-
- private String createRandomDate()
- {
- return "20" + ( counter++ + 10 ) + "-0" + ( ( counter++ % 10 ) + 1 ) + "-" + ( ( counter++ % 19 ) + 10 );
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividendsService.java
----------------------------------------------------------------------
diff --git a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividendsService.java b/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividendsService.java
deleted file mode 100644
index 700ecb8..0000000
--- a/libraries/cxf/src/test/java/org/qi4j/library/cxf/divs/ProjectedDividendsService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010 Niclas Hedhman.
- *
- * Licensed 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.qi4j.library.cxf.divs;
-
-import org.qi4j.library.cxf.JaxWsService;
-
-public interface ProjectedDividendsService extends ProjectedDividends, JaxWsService
-{
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 8ab6e91..1ce0e33 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,7 +28,6 @@ include "core:functional",
'libraries:circuitbreaker',
'libraries:constraints',
'libraries:conversion',
- 'libraries:cxf',
'libraries:eventsourcing',
'libraries:eventsourcing-jdbm',
'libraries:eventsourcing-rest',
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/72e375eb/tutorials/composites/build.gradle
----------------------------------------------------------------------
diff --git a/tutorials/composites/build.gradle b/tutorials/composites/build.gradle
index a2106e5..6b59407 100644
--- a/tutorials/composites/build.gradle
+++ b/tutorials/composites/build.gradle
@@ -6,7 +6,7 @@ dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
compile(project(":org.qi4j.libraries:org.qi4j.library.constraints"))
compile(project(":org.qi4j.libraries:org.qi4j.library.rdf"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.lang-jruby"))
+ compile(project(":org.qi4j.libraries:org.qi4j.library.lang-groovy"))
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
[3/5] zest-qi4j git commit: Have to remove lang-jruby and
lang-beanshell due to Licensing restrictions of ASF.
Posted by ni...@apache.org.
Have to remove lang-jruby and lang-beanshell due to Licensing restrictions of ASF.
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/060bb358
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/060bb358
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/060bb358
Branch: refs/heads/develop
Commit: 060bb358521ff1a4e7c045b267a486f2358cc857
Parents: b4e655f
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Fri Jun 12 10:20:47 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Fri Jun 12 10:20:47 2015 +0800
----------------------------------------------------------------------
libraries.gradle | 10 -
libraries/lang-beanshell/README.txt | 10 +
libraries/lang-beanshell/build.gradle | 14 -
libraries/lang-beanshell/dev-status.xml | 19 -
libraries/lang-beanshell/licenses/lgpl.license | 321 ---
libraries/lang-beanshell/licenses/spl.license | 472 ----
.../lang-beanshell/src/docs/lang-beanshell.txt | 37 -
.../org/qi4j/lang/beanshell/BeanShellMixin.java | 223 --
.../java/org/qi4j/lang/beanshell/package.html | 5 -
.../qi4j/lang/beanshell/BeanShellComposite.java | 23 -
.../qi4j/lang/beanshell/BeanShellMixinTest.java | 47 -
.../org/qi4j/lang/beanshell/HelloSpeaker.java | 24 -
.../java/org/qi4j/lang/beanshell/Mixin1.java | 6 -
.../qi4j/lang/beanshell/BeanShellComposite.bsh | 24 -
libraries/lang-jruby/NOTICE | 2153 ------------------
libraries/lang-jruby/README.txt | 10 +
libraries/lang-jruby/build.gradle | 15 -
libraries/lang-jruby/dev-status.xml | 19 -
libraries/lang-jruby/licenses/jruby.license | 60 -
libraries/lang-jruby/src/docs/lang-jruby.txt | 29 -
.../java/org/qi4j/lang/jruby/JRubyMixin.java | 258 ---
.../main/java/org/qi4j/lang/jruby/package.html | 5 -
.../java/org/qi4j/lang/jruby/HelloSpeaker.java | 24 -
.../org/qi4j/lang/jruby/JRubyMixinTest.java | 41 -
.../java/org/qi4j/lang/jruby/MyDomainType.java | 6 -
.../org/qi4j/lang/jruby/MyDomainType.rb | 17 -
settings.gradle | 2 -
27 files changed, 20 insertions(+), 3854 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 7903c59..008bf80 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -1,6 +1,5 @@
// Versions of Dependencies;
def asmVersion = '5.0.3'
-def beanshellVersion = '2.0b4'
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.50'
def c3p0Version = '0.9.1.2'
@@ -31,7 +30,6 @@ def jettyVersion = '9.2.1.v20140609'
def jgoodiesLooksVersion = '2.5.3'
def jodaMoneyVersion = '0.9.1'
def jodaTimeVersion = '2.3'
-def jrubyVersion = '1.7.8' // 1.7.12 - Fails to run!
def jtaVersion = '1.1'
def leveldbVersion = '0.7'
def leveldbJniVersion = '1.8'
@@ -181,14 +179,6 @@ rootProject.ext {
// Scripting
groovy: "org.codehaus.groovy:groovy-all:$groovyVersion",
- jruby: "org.jruby:jruby:$jrubyVersion",
-
- beanshell: [ "org.beanshell:bsh-core:$beanshellVersion",
- "org.beanshell:bsh-classpath:$beanshellVersion",
- "org.beanshell:bsh-classgen:$beanshellVersion",
- "org.beanshell:bsh-reflect:$beanshellVersion"
-
- ],
javascript: "org.mozilla:rhino:$javascriptVersion",
// Wicket
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/README.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/README.txt b/libraries/lang-beanshell/README.txt
new file mode 100644
index 0000000..4cb1b55
--- /dev/null
+++ b/libraries/lang-beanshell/README.txt
@@ -0,0 +1,10 @@
+
+BeanShell is licensed under LGPL, and Apache Software Foundation
+doesn't allow the use of LGPL in Apache projects.
+
+Therefor, Apache Zest had to drop this library component, but
+it is still available for separate download at
+
+https://github.com/Qi4j/qi4j-sdk
+
+in the libraries/lang-beanshell directory.
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/build.gradle b/libraries/lang-beanshell/build.gradle
deleted file mode 100644
index 72eb3ba..0000000
--- a/libraries/lang-beanshell/build.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-description = "Qi4j BeanShell Library allows for Mixins to be implemented in BeanShell (Java) scripts instead of directly in compiled Java."
-
-jar { manifest { name = "Qi4j Library - Scripting - BeanShell" }}
-
-dependencies {
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile( project( ':org.qi4j.libraries:org.qi4j.library.scripting' ))
- compile(libraries.beanshell)
-
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
-
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
- testRuntime(libraries.logback)
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/dev-status.xml b/libraries/lang-beanshell/dev-status.xml
deleted file mode 100644
index cefc98a..0000000
--- a/libraries/lang-beanshell/dev-status.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
- http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
- <status>
- <!--none,early,beta,stable,mature-->
- <codebase>beta</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/zest-qi4j/blob/060bb358/libraries/lang-beanshell/licenses/lgpl.license
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/licenses/lgpl.license b/libraries/lang-beanshell/licenses/lgpl.license
deleted file mode 100644
index 688e8a6..0000000
--- a/libraries/lang-beanshell/licenses/lgpl.license
+++ /dev/null
@@ -1,321 +0,0 @@
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Lesser General
-Public License (also called "this License"). Each licensee is addressed as
-"you".
-
-A "library" means a collection of software functions and/or data prepared
-so as to be conveniently linked with application programs (which use some
-of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which
-has been distributed under these terms. A "work based on the Library"
-means either the Library or any derivative work under copyright law: that
-is to say, a work containing the Library or a portion of it, either
-verbatim or with modifications and/or translated straightforwardly into
-another language. (Hereinafter, translation is included without limitation
-in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making
-modifications to it. For a library, complete source code means all the
-source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and
-installation of the library.
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running a
-program using the Library is not restricted, and output from such a
-program is covered only if its contents constitute a work based on the
-Library (independent of the use of the Library in a tool for writing it).
-Whether that is true depends on what the Library does and what the program
-that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the notices
-that refer to this License and to the absence of any warranty; and
-distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it,
-thus forming a work based on the Library, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that
-you also meet all of these conditions:
-
- * a) The modified work must itself be a software library.
- * b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
- * c) You must cause the whole of the work to be licensed at no charge
- to all third parties under the terms of this License.
- * d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure
- that, in the event an application does not supply such function
- or table, the facility still operates, and performs whatever part
- of its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has a
- purpose that is entirely well-defined independent of the application.
- Therefore, Subsection 2d requires that any application-supplied
- function or table used by this function must be optional: if the
- application does not supply it, the square root function must still
- compute square roots.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Library, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you
-distribute them as separate works. But when you distribute the same
-sections as part of a whole which is a work based on the Library, the
-distribution of the whole must be on the terms of this License, whose
-permissions for other licensees extend to the entire whole, and thus to
-each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise
-the right to control the distribution of derivative or collective works
-based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so that
-they refer to the ordinary GNU General Public License, version 2, instead
-of to this License. (If a newer version than version 2 of the ordinary GNU
-General Public License has appeared, then you can specify that version
-instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that
-copy, so the ordinary GNU General Public License applies to all subsequent
-copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the
-Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of
-it, under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you accompany it with the complete
-corresponding machine-readable source code, which must be distributed
-under the terms of Sections 1 and 2 above on a medium customarily used for
-software interchange.
-
-If distribution of object code is made by offering access to copy from a
-designated place, then offering equivalent access to copy the source code
-from the same place satisfies the requirement to distribute the source
-code, even though third parties are not compelled to copy the source along
-with the object code.
-
-5. A program that contains no derivative of any portion of the Library,
-but is designed to work with the Library by being compiled or linked with
-it, is called a "work that uses the Library". Such a work, in isolation,
-is not a derivative work of the Library, and therefore falls outside the
-scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates
-an executable that is a derivative of the Library (because it contains
-portions of the Library), rather than a "work that uses the library". The
-executable is therefore covered by this License. Section 6 states terms
-for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that
-is part of the Library, the object code for the work may be a derivative
-work of the Library even though the source code is not. Whether this is
-true is especially significant if the work can be linked without the
-Library, or if the work is itself a library. The threshold for this to be
-true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure
-layouts and accessors, and small macros and small inline functions (ten
-lines or less in length), then the use of the object file is unrestricted,
-regardless of whether it is legally a derivative work. (Executables
-containing this object code plus portions of the Library will still fall
-under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute
-the object code for the work under the terms of Section 6. Any executables
-containing that work also fall under Section 6, whether or not they are
-linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a
-"work that uses the Library" with the Library to produce a work containing
-portions of the Library, and distribute that work under terms of your
-choice, provided that the terms permit modification of the work for the
-customer's own use and reverse engineering for debugging such
-modifications.
-
-You must give prominent notice with each copy of the work that the Library
-is used in it and that the Library and its use are covered by this
-License. You must supply a copy of this License. If the work during
-execution displays copyright notices, you must include the copyright
-notice for the Library among them, as well as a reference directing the
-user to the copy of this License. Also, you must do one of these things:
-
- * a) Accompany the work with the complete corresponding machine-
- readable source code for the Library including whatever changes
- were used in the work (which must be distributed under Sections 1
- and 2 above); and, if the work is an executable linked with the
- Library, with the complete machine-readable "work that uses the
- Library", as object code and/or source code, so that the user can
- modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in
- the Library will not necessarily be able to recompile the
- application to use the modified definitions.)
- * b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer
- system, rather than copying library functions into the
- executable, and (2) will operate properly with a modified
- version of the library, if the user installs one, as long as the
- modified version is interface-compatible with the version that
- the work was made with.
- * c) Accompany the work with a written offer, valid for at least three
- years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
- * d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the
- above specified materials from the same place.
- * e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library"
-must include any data and utility programs needed for reproducing the
-executable from it. However, as a special exception, the materials to be
-distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless
-that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions
-of other proprietary libraries that do not normally accompany the
-operating system. Such a contradiction means you cannot use both them and
-the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library
-side-by-side in a single library together with other library facilities
-not covered by this License, and distribute such a combined library,
-provided that the separate distribution of the work based on the Library
-and of the other library facilities is otherwise permitted, and provided
-that you do these two things:
-
- * a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities.
- This must be distributed under the terms of the Sections above.
- * b) Give prominent notice with the combined library of the fact that
- part of it is a work based on the Library, and explaining where
- to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the
-Library except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense, link with, or distribute the
-Library is void, and will automatically terminate your rights under this
-License. However, parties who have received copies, or rights, from you
-under this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute
-the Library or its derivative works. These actions are prohibited by law
-if you do not accept this License. Therefore, by modifying or distributing
-the Library (or any work based on the Library), you indicate your
-acceptance of this License to do so, and all its terms and conditions for
-copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the original
-licensor to copy, distribute, link with or modify the Library subject to
-these terms and conditions. You may not impose any further restrictions on
-the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute
-so as to satisfy simultaneously your obligations under this License and
-any other pertinent obligations, then as a consequence you may not
-distribute the Library at all. For example, if a patent license would not
-permit royalty-free redistribution of the Library by all those who receive
-copies directly or indirectly through you, then the only way you could
-satisfy both it and this License would be to refrain entirely from
-distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any such
-claims; this section has the sole purpose of protecting the integrity of
-the free software distribution system which is implemented by public
-license practices. Many people have made generous contributions to the
-wide range of software distributed through that system in reliance on
-consistent application of that system; it is up to the author/donor to
-decide if he or she is willing to distribute software through any other
-system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Library under this License may add an
-explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions
-of the Lesser General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in detail
-to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by the
-Free Software Foundation. If the Library does not specify a license
-version number, you may choose any version ever published by the Free
-Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these, write
-to the author to ask for permission. For software which is copyrighted by
-the Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the two
-goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE
-LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT
-LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES
-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE
-WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/licenses/spl.license
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/licenses/spl.license b/libraries/lang-beanshell/licenses/spl.license
deleted file mode 100644
index 7e0dfa9..0000000
--- a/libraries/lang-beanshell/licenses/spl.license
+++ /dev/null
@@ -1,472 +0,0 @@
- SUN PUBLIC LICENSE Version 1.0
-
-1. Definitions.
-
- 1.0.1. "Commercial Use" means distribution or otherwise making the
- Covered Code available to a third party.
-
- 1.1. "Contributor" means each entity that creates or contributes to
- the creation of Modifications.
-
- 1.2. "Contributor Version" means the combination of the Original Code,
- prior Modifications used by a Contributor, and the Modifications made
- by that particular Contributor.
-
- 1.3. "Covered Code" means the Original Code or Modifications or the
- combination of the Original Code and Modifications, in each case
- including portions thereof and corresponding documentation released
- with the source code.
-
- 1.4. "Electronic Distribution Mechanism" means a mechanism generally
- accepted in the software development community for the electronic
- transfer of data.
-
- 1.5. "Executable" means Covered Code in any form other than Source
- Code.
-
- 1.6. "Initial Developer" means the individual or entity identified as
- the Initial Developer in the Source Code notice required by Exhibit A.
-
- 1.7. "Larger Work" means a work which combines Covered Code or
- portions thereof with code not governed by the terms of this License.
-
- 1.8. "License" means this document.
-
- 1.8.1. "Licensable" means having the right to grant, to the maximum
- extent possible, whether at the time of the initial grant or
- subsequently acquired, any and all of the rights conveyed herein.
-
- 1.9. "Modifications" means any addition to or deletion from the
- substance or structure of either the Original Code or any previous
- Modifications. When Covered Code is released as a series of files, a
- Modification is:
-
- A. Any addition to or deletion from the contents of a file containing
- Original Code or previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
- previous Modifications.
-
- 1.10. "Original Code" means Source Code of computer software code
- which is described in the Source Code notice required by Exhibit A as
- Original Code, and which, at the time of its release under this
- License is not already Covered Code governed by this License.
-
- 1.10.1. "Patent Claims" means any patent claim(s), now owned or
- hereafter acquired, including without limitation, method, process, and
- apparatus claims, in any patent Licensable by grantor.
-
- 1.11. "Source Code" means the preferred form of the Covered Code for
- making modifications to it, including all modules it contains, plus
- any associated documentation, interface definition files, scripts used
- to control compilation and installation of an Executable, or source
- code differential comparisons against either the Original Code or
- another well known, available Covered Code of the Contributor's
- choice. The Source Code can be in a compressed or archival form,
- provided the appropriate decompression or de-archiving software is
- widely available for no charge.
-
- 1.12. "You" (or "Your") means an individual or a legal entity
- exercising rights under, and complying with all of the terms of, this
- License or a future version of this License issued under Section 6.1.
- For legal entities, "You" includes any entity which controls, is
- controlled by, or is under common control with You. For purposes of
- this definition, "control" means (a) the power, direct or indirect, to
- cause the direction or management of such entity, whether by contract
- or otherwise, or (b) ownership of more than fifty percent (50%) of the
- outstanding shares or beneficial ownership of such entity.
-
-2. Source Code License.
-
-2.1 The Initial Developer Grant.
-
- The Initial Developer hereby grants You a world-wide, royalty-free,
- non-exclusive license, subject to third party intellectual property
- claims:
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Initial Developer to use, reproduce, modify,
- display, perform, sublicense and distribute the Original Code (or
- portions thereof) with or without Modifications, and/or as part of a
- Larger Work; and
-
- (b) under Patent Claims infringed by the making, using or selling of
- Original Code, to make, have made, use, practice, sell, and offer for
- sale, and/or otherwise dispose of the Original Code (or portions
- thereof).
-
- (c) the licenses granted in this Section 2.1(a) and (b) are effective
- on the date Initial Developer first distributes Original Code under
- the terms of this License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent license is
- granted: 1) for code that You delete from the Original Code; 2)
- separate from the Original Code; or 3) for infringements caused by:
- i) the modification of the Original Code or ii) the combination of the
- Original Code with other software or devices.
-
-2.2. Contributor Grant.
-
- Subject to third party intellectual property claims, each Contributor
- hereby grants You a world-wide, royalty-free, non-exclusive license
-
- (a) under intellectual property rights (other than patent or
- trademark) Licensable by Contributor, to use, reproduce, modify,
- display, perform, sublicense and distribute the Modifications created
- by such Contributor (or portions thereof) either on an unmodified
- basis, with other Modifications, as Covered Code and/or as part of a
- Larger Work; and
-
- (b) under Patent Claims infringed by the making, using, or selling of
- Modifications made by that Contributor either alone and/or in
- combination with its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale, have made, and/or
- otherwise dispose of: 1) Modifications made by that Contributor (or
- portions thereof); and 2) the combination of Modifications made by
- that Contributor with its Contributor Version (or portions of such
- combination).
-
- (c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective
- on the date Contributor first makes Commercial Use of the Covered
- Code.
-
- (d) notwithstanding Section 2.2(b) above, no patent license is
- granted: 1) for any code that Contributor has deleted from the
- Contributor Version; 2) separate from the Contributor Version; 3) for
- infringements caused by: i) third party modifications of Contributor
- Version or ii) the combination of Modifications made by that
- Contributor with other software (except as part of the Contributor
- Version) or other devices; or 4) under Patent Claims infringed by
- Covered Code in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Application of License.
-
- The Modifications which You create or to which You contribute are
- governed by the terms of this License, including without limitation
- Section 2.2. The Source Code version of Covered Code may be
- distributed only under the terms of this License or a future version
- of this License released under Section 6.1, and You must include a
- copy of this License with every copy of the Source Code You
- distribute. You may not offer or impose any terms on any Source Code
- version that alters or restricts the applicable version of this
- License or the recipients' rights hereunder. However, You may include
- an additional document offering the additional rights described in
- Section 3.5.
-
-3.2. Availability of Source Code.
-
- Any Modification which You create or to which You contribute must be
- made available in Source Code form under the terms of this License
- either on the same media as an Executable version or via an accepted
- Electronic Distribution Mechanism to anyone to whom you made an
- Executable version available; and if made available via Electronic
- Distribution Mechanism, must remain available for at least twelve (12)
- months after the date it initially became available, or at least six
- (6) months after a subsequent version of that particular Modification
- has been made available to such recipients. You are responsible for
- ensuring that the Source Code version remains available even if the
- Electronic Distribution Mechanism is maintained by a third party.
-
-3.3. Description of Modifications.
-
- You must cause all Covered Code to which You contribute to contain a
- file documenting the changes You made to create that Covered Code and
- the date of any change. You must include a prominent statement that
- the Modification is derived, directly or indirectly, from Original
- Code provided by the Initial Developer and including the name of the
- Initial Developer in (a) the Source Code, and (b) in any notice in an
- Executable version or related documentation in which You describe the
- origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters.
-
- (a) Third Party Claims.
-
- If Contributor has knowledge that a license under a third party's
- intellectual property rights is required to exercise the rights
- granted by such Contributor under Sections 2.1 or 2.2, Contributor
- must include a text file with the Source Code distribution titled
- "LEGAL'' which describes the claim and the party making the claim in
- sufficient detail that a recipient will know whom to contact. If
- Contributor obtains such knowledge after the Modification is made
- available as described in Section 3.2, Contributor shall promptly
- modify the LEGAL file in all copies Contributor makes available
- thereafter and shall take other steps (such as notifying appropriate
- mailing lists or newsgroups) reasonably calculated to inform those who
- received the Covered Code that new knowledge has been obtained.
-
- (b) Contributor APIs.
-
- If Contributor's Modifications include an application programming
- interface ("API") and Contributor has knowledge of patent licenses
- which are reasonably necessary to implement that API, Contributor must
- also include this information in the LEGAL file.
-
- (c) Representations.
-
- Contributor represents that, except as disclosed pursuant to Section
- 3.4(a) above, Contributor believes that Contributor's Modifications
- are Contributor's original creation(s) and/or Contributor has
- sufficient rights to grant the rights conveyed by this License.
-
-3.5. Required Notices.
-
- You must duplicate the notice in Exhibit A in each file of the Source
- Code. If it is not possible to put such notice in a particular Source
- Code file due to its structure, then You must include such notice in a
- location (such as a relevant directory) where a user would be likely
- to look for such a notice. If You created one or more Modification(s)
- You may add your name as a Contributor to the notice described in
- Exhibit A. You must also duplicate this License in any documentation
- for the Source Code where You describe recipients' rights or ownership
- rights relating to Covered Code. You may choose to offer, and to
- charge a fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Code. However, You
- may do so only on Your own behalf, and not on behalf of the Initial
- Developer or any Contributor. You must make it absolutely clear than
- any such warranty, support, indemnity or liability obligation is
- offered by You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred by the
- Initial Developer or such Contributor as a result of warranty,
- support, indemnity or liability terms You offer.
-
-3.6. Distribution of Executable Versions.
-
- You may distribute Covered Code in Executable form only if the
- requirements of Section 3.1-3.5 have been met for that Covered Code,
- and if You include a notice stating that the Source Code version of
- the Covered Code is available under the terms of this License,
- including a description of how and where You have fulfilled the
- obligations of Section 3.2. The notice must be conspicuously included
- in any notice in an Executable version, related documentation or
- collateral in which You describe recipients' rights relating to the
- Covered Code. You may distribute the Executable version of Covered
- Code or ownership rights under a license of Your choice, which may
- contain terms different from this License, provided that You are in
- compliance with the terms of this License and that the license for the
- Executable version does not attempt to limit or alter the recipient's
- rights in the Source Code version from the rights set forth in this
- License. If You distribute the Executable version under a different
- license You must make it absolutely clear that any terms which differ
- from this License are offered by You alone, not by the Initial
- Developer or any Contributor. You hereby agree to indemnify the
- Initial Developer and every Contributor for any liability incurred by
- the Initial Developer or such Contributor as a result of any such
- terms You offer.
-
-3.7. Larger Works.
-
- You may create a Larger Work by combining Covered Code with other code
- not governed by the terms of this License and distribute the Larger
- Work as a single product. In such a case, You must make sure the
- requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
- If it is impossible for You to comply with any of the terms of this
- License with respect to some or all of the Covered Code due to
- statute, judicial order, or regulation then You must: (a) comply with
- the terms of this License to the maximum extent possible; and (b)
- describe the limitations and the code they affect. Such description
- must be included in the LEGAL file described in Section 3.4 and must
- be included with all distributions of the Source Code. Except to the
- extent prohibited by statute or regulation, such description must be
- sufficiently detailed for a recipient of ordinary skill to be able to
- understand it.
-
-5. Application of this License.
-
- This License applies to code to which the Initial Developer has
- attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-6.1. New Versions.
-
- Sun Microsystems, Inc. ("Sun") may publish revised and/or new versions
- of the License from time to time. Each version will be given a
- distinguishing version number.
-
-6.2. Effect of New Versions.
-
- Once Covered Code has been published under a particular version of the
- License, You may always continue to use it under the terms of that
- version. You may also choose to use such Covered Code under the terms
- of any subsequent version of the License published by Sun. No one
- other than Sun has the right to modify the terms applicable to Covered
- Code created under this License.
-
-6.3. Derivative Works.
-
- If You create or use a modified version of this License (which you may
- only do in order to apply it to code which is not already Covered Code
- governed by this License), You must: (a) rename Your license so that
- the phrases "Sun," "Sun Public License," or "SPL" or any confusingly
- similar phrase do not appear in your license (except to note that your
- license differs from this License) and (b) otherwise make it clear
- that Your version of the license contains terms which differ from the
- Sun Public License. (Filling in the name of the Initial Developer,
- Original Code or Contributor in the notice described in Exhibit A
- shall not of themselves be deemed to be modifications of this
- License.)
-
-7. DISCLAIMER OF WARRANTY.
-
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS,
- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
- THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
- IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
- YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
- COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
- 8.1. This License and the rights granted hereunder will terminate
- automatically if You fail to comply with terms herein and fail to cure
- such breach within 30 days of becoming aware of the breach. All
- sublicenses to the Covered Code which are properly granted shall
- survive any termination of this License. Provisions which, by their
- nature, must remain in effect beyond the termination of this License
- shall survive.
-
- 8.2. If You initiate litigation by asserting a patent infringement
- claim (excluding declaratory judgment actions) against Initial Developer
- or a Contributor (the Initial Developer or Contributor against whom
- You file such action is referred to as "Participant") alleging that:
-
- (a) such Participant's Contributor Version directly or indirectly
- infringes any patent, then any and all rights granted by such
- Participant to You under Sections 2.1 and/or 2.2 of this License
- shall, upon 60 days notice from Participant terminate prospectively,
- unless if within 60 days after receipt of notice You either: (i)
- agree in writing to pay Participant a mutually agreeable reasonable
- royalty for Your past and future use of Modifications made by such
- Participant, or (ii) withdraw Your litigation claim with respect to
- the Contributor Version against such Participant. If within 60 days
- of notice, a reasonable royalty and payment arrangement are not
- mutually agreed upon in writing by the parties or the litigation claim
- is not withdrawn, the rights granted by Participant to You under
- Sections 2.1 and/or 2.2 automatically terminate at the expiration of
- the 60 day notice period specified above.
-
- (b) any software, hardware, or device, other than such Participant's
- Contributor Version, directly or indirectly infringes any patent, then
- any rights granted to You by such Participant under Sections 2.1(b)
- and 2.2(b) are revoked effective as of the date You first made, used,
- sold, distributed, or had made, Modifications made by that
- Participant.
-
- 8.3. If You assert a patent infringement claim against Participant
- alleging that such Participant's Contributor Version directly or
- indirectly infringes any patent where such claim is resolved (such as
- by license or settlement) prior to the initiation of patent
- infringement litigation, then the reasonable value of the licenses
- granted by such Participant under Sections 2.1 or 2.2 shall be taken
- into account in determining the amount or value of any payment or
- license.
-
- 8.4. In the event of termination under Sections 8.1 or 8.2 above, all
- end user license agreements (excluding distributors and resellers)
- which have been validly granted by You or any distributor hereunder
- prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
- DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
- OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
- ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
- CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
- WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
- RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
- EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
- THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
- The Covered Code is a "commercial item," as that term is defined in 48
- C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software"
- and "commercial computer software documentation," as such terms are
- used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R.
- 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
- U.S. Government End Users acquire Covered Code with only those rights
- set forth herein.
-
-11. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. This License shall be governed by
- California law provisions (except to the extent applicable law, if
- any, provides otherwise), excluding its conflict-of-law provisions.
- With respect to disputes in which at least one party is a citizen of,
- or an entity chartered or registered to do business in the United
- States of America, any litigation relating to this License shall be
- subject to the jurisdiction of the Federal Courts of the Northern
- District of California, with venue lying in Santa Clara County,
- California, with the losing party responsible for costs, including
- without limitation, court costs and reasonable attorneys' fees and
- expenses. The application of the United Nations Convention on
- Contracts for the International Sale of Goods is expressly excluded.
- Any law or regulation which provides that the language of a contract
- shall be construed against the drafter shall not apply to this
- License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or indirectly,
- out of its utilization of rights under this License and You agree to
- work with Initial Developer and Contributors to distribute such
- responsibility on an equitable basis. Nothing herein is intended or
- shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
- Initial Developer may designate portions of the Covered Code as
- "Multiple-Licensed". "Multiple-Licensed" means that the Initial
- Developer permits you to utilize portions of the Covered Code under
- Your choice of the alternative licenses, if any, specified by the
- Initial Developer in the file described in Exhibit A.
-
-Exhibit A -Sun Public License Notice.
-
- The contents of this file are subject to the Sun Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. A copy of the License is available at
- http://www.sun.com/
-
- The Original Code is _________________. The Initial Developer of the
- Original Code is ___________. Portions created by ______ are Copyright
- (C)_________. All Rights Reserved.
-
- Contributor(s): ______________________________________.
-
- Alternatively, the contents of this file may be used under the terms
- of the _____ license (the "[___] License"), in which case the
- provisions of [______] License are applicable instead of those above.
- If you wish to allow use of your version of this file only under the
- terms of the [____] License and not to allow others to use your
- version of this file under the SPL, indicate your decision by deleting
- the provisions above and replace them with the notice and other
- provisions required by the [___] License. If you do not delete the
- provisions above, a recipient may use your version of this file under
- either the SPL or the [___] License."
-
- [NOTE: The text of this Exhibit A may differ slightly from the text of
- the notices in the Source Code files of the Original Code. You should
- use the text of this Exhibit A rather than the text found in the
- Original Code Source Code for Your Modifications.]
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/docs/lang-beanshell.txt
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/docs/lang-beanshell.txt b/libraries/lang-beanshell/src/docs/lang-beanshell.txt
deleted file mode 100644
index 7a08f81..0000000
--- a/libraries/lang-beanshell/src/docs/lang-beanshell.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[[library-script-beanshell, Beanshell Scripting Library]]
-= Beanshell Scripting =
-
-[devstatus]
---------------
-source=libraries/lang-beanshell/dev-status.xml
---------------
-
-Beanshell Scripting Library
-
-NOTE: This Library has no documentation yet. Learn how to contribute in <<community-docs>>.
-
-include::../../build/docs/buildinfo/artifact.txt[]
-
-
-The Beanshell Scripting Library is a Generic mixin that implements interfaces
-by delegating to Beanshell method. Each method in an interface is declared by a
-BeanShell method in a file located in classpath with the name _INTEFRACE_FQDN_.bsh,
-where the INTEFRACE_FQDN includes the package, and has "." replaced with "/".
-
- Example:
- org/qi4j/samples/hello/domain/HelloWorldSpeaker.bsh
-
-That means that the HelloWorldSpeaker.bsh file may be co-located with the
-class files in the same package. It is currently not supported to place
-the BeanShell implementation of the mixin in a different package than the
-interface it implements.
-
-To use BeanShell to implement the Mixin functionality for a given interface,
-simply declare the +BeanShellMixin+ like any other mixin, either in the interface
-or at assembly time.
-
-[snippet,java]
-----
-source=libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java
-tag=mixin
-----
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/BeanShellMixin.java
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/BeanShellMixin.java b/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/BeanShellMixin.java
deleted file mode 100644
index a276605..0000000
--- a/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/BeanShellMixin.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2008 Niclas Hedhman
- * Copyright 2007-2008 Rickard Öberg
- * Licensed 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.qi4j.lang.beanshell;
-
-import bsh.BshClassManager;
-import bsh.EvalError;
-import bsh.Interpreter;
-import bsh.NameSpace;
-import bsh.classpath.BshClassPath;
-import bsh.classpath.ClassManagerImpl;
-import java.io.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import org.qi4j.api.common.AppliesTo;
-import org.qi4j.api.common.AppliesToFilter;
-import org.qi4j.api.composite.Composite;
-import org.qi4j.api.composite.TransientBuilderFactory;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.injection.scope.This;
-import org.qi4j.api.structure.Module;
-import org.qi4j.api.unitofwork.UnitOfWorkFactory;
-import org.qi4j.library.scripting.ScriptException;
-import org.qi4j.library.scripting.ScriptReloadable;
-
-/**
- * Generic mixin that implements interfaces by delegating to BeanShell methods
- * Each method in an interface is declared by a BeanShell method
- * in a file located in classpath with the name "<interface>.bsh",
- * where the interface name includes the package, and has "." replaced with "/".
- * <p>
- * Example:
- * </p>
- * <p>
- * org/qi4j/samples/hello/domain/HelloWorldSpeaker.bsh
- * </p>
- */
-@AppliesTo( BeanShellMixin.AppliesTo.class )
-public class BeanShellMixin
- implements InvocationHandler, ScriptReloadable
-{
- private static HashMap<Module, Interpreter> runtimes;
-
- @This private Composite me;
- @Structure private Module module;
- @Structure private TransientBuilderFactory compositeBuilderFactory;
- @Structure private UnitOfWorkFactory uowFactory;
- private Map<Class, Object> mixins;
-
- public static class AppliesTo
- implements AppliesToFilter
- {
- private static Interpreter runtime = new Interpreter();
-
- @Override
- public boolean appliesTo( Method method, Class mixin, Class compositeType, Class modelClass )
- {
- // Need optimizations so that this method only build the namespace and extract the mixins
- // once per composite.
- try
- {
-
- NameSpace namespace = buildNamespace( compositeType, runtime );
- if( namespace == null )
- {
- return false;
- }
- runtime.setNameSpace( namespace );
- }
- catch( IOException e )
- {
- e.printStackTrace(); //TODO: Auto-generated, need attention.
- }
- Map<Class, Object> mixins = extractMixins( runtime.getClassManager() );
- return mixins.containsKey( method.getDeclaringClass() );
- }
- }
-
- static
- {
- runtimes = new HashMap<Module, Interpreter>();
- }
-
- @Override
- public Object invoke( Object proxy, Method method, Object[] args )
- throws Throwable
- {
- Interpreter runtime;
- synchronized( BeanShellMixin.class )
- {
- runtime = runtimes.get( module );
- }
- if( runtime == null )
- {
- runtime = new Interpreter();
- BshClassManager.createClassManager( runtime );
- Class compositeType = me.getClass().getInterfaces()[ 0 ];
- NameSpace namespace = buildNamespace( compositeType, runtime );
- runtime.setNameSpace( namespace );
- synchronized( BeanShellMixin.class )
- {
- runtimes.put( module, runtime );
- }
- runtime.set( "compositeBuilderFactory", compositeBuilderFactory );
- runtime.set( "unitOfWorkFactory", uowFactory );
- }
- if( mixins == null )
- {
- mixins = extractMixins( runtime.getClassManager() );
- }
- Object instance = mixins.get( method.getDeclaringClass() );
- return method.invoke( instance, args );
- }
-
- private static NameSpace buildNamespace( Class compositeType, Interpreter runtime )
- throws IOException
- {
- ClassLoader loader = compositeType.getClassLoader();
- BshClassManager classManager = BshClassManager.createClassManager( runtime );
- classManager.setClassLoader( loader );
- NameSpace namespace = new NameSpace( classManager, compositeType.getName() );
-
- URL scriptUrl = getFunctionResource( compositeType );
- if( scriptUrl == null )
- {
- return null;
- }
- Reader source = getSource( compositeType, scriptUrl );
- try
- {
- runtime.eval( source, namespace, scriptUrl.toString() );
- }
- catch( EvalError evalError )
- {
- evalError.printStackTrace(); //TODO: Auto-generated, need attention.
- }
- return namespace;
- }
-
- private static Map<Class, Object> extractMixins( BshClassManager classManager )
- {
- Class mixinImpl = null;
- try
- {
- Field field = ClassManagerImpl.class.getDeclaredField( "baseClassPath" );
- field.setAccessible( true );
- BshClassPath classpath = (BshClassPath) field.get( classManager );
- String[] scriptedMixinNames = classpath.getAllNames();
- Map<Class, Object> mixinTypes = new HashMap<Class, Object>();
- for( String mixinName : scriptedMixinNames )
- {
- mixinImpl = classManager.classForName( mixinName );
- Class[] interfaces = mixinImpl.getInterfaces();
- Object mixinInstance = mixinImpl.newInstance();
- for( Class mixinType : interfaces )
- {
- mixinTypes.put( mixinType, mixinInstance );
- }
- }
- return mixinTypes;
- }
- catch( IllegalAccessException e )
- {
- // Can not happen. Accessible is set to true, and a SecurityException will be thrown
- // if the security doesn't allow direct inspection.
- return null;
- }
- catch( NoSuchFieldException e )
- {
- throw new InternalError( "BeanShell version has been updated and is no longer compatible with this Qi4j version." );
- }
- catch( InstantiationException e )
- {
- throw new ScriptException( "Unable to instantiate BeanShell class: " + mixinImpl );
- }
- }
-
- protected static Reader getSource( Class compositeType, URL scriptUrl )
- throws IOException
- {
- if( scriptUrl == null )
- {
- throw new IOException( "No script found for method " + compositeType.getName() );
- }
- InputStream in = scriptUrl.openStream();
- return new BufferedReader( new InputStreamReader( in ) );
- }
-
- private static URL getFunctionResource( Class compositeType )
- {
- String scriptName = getScriptName( compositeType );
- ClassLoader loader = compositeType.getClassLoader();
- return loader.getResource( scriptName );
- }
-
- private static String getScriptName( Class compositeType )
- {
- String classname = compositeType.getName();
- return classname.replace( '.', '/' ) + ".bsh";
- }
-
- @Override
- public void reloadScripts()
- {
- synchronized( BeanShellMixin.class )
- {
- runtimes.remove( module );
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/package.html
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/package.html b/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/package.html
deleted file mode 100644
index 527017e..0000000
--- a/libraries/lang-beanshell/src/main/java/org/qi4j/lang/beanshell/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
- <body>
- <h2>BeanShell Language Support Library.</h2>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellComposite.java
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellComposite.java b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellComposite.java
deleted file mode 100644
index 9654be4..0000000
--- a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellComposite.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2008 Niclas Hedhman
- * Licensed 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.qi4j.lang.beanshell;
-
-import org.qi4j.api.composite.TransientComposite;
-import org.qi4j.api.mixin.Mixins;
-
-/**
- * JAVADOC
- */
-@Mixins( BeanShellMixin.class )
-public interface BeanShellComposite extends Mixin1, TransientComposite
-{
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellMixinTest.java
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellMixinTest.java b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellMixinTest.java
deleted file mode 100644
index d616811..0000000
--- a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/BeanShellMixinTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2007-2008 Niclas Hedhman
- * Copyright 2007-2008 Rickard Öberg
- * Licensed 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.qi4j.lang.beanshell;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.qi4j.bootstrap.AssemblyException;
-import org.qi4j.bootstrap.ModuleAssembly;
-import org.qi4j.test.AbstractQi4jTest;
-
-public class BeanShellMixinTest
- extends AbstractQi4jTest
-{
- public void assemble( ModuleAssembly module )
- throws AssemblyException
- {
- module.transients( BeanShellComposite.class );
- }
-
- @Test
- public void testInvoke() throws Throwable
- {
- BeanShellComposite domain1 = module.newTransient( BeanShellComposite.class );
- BeanShellComposite domain2 = module.newTransient( BeanShellComposite.class );
- Assert.assertEquals( "do1() in Beanshell:1", domain1.do1() );
- Assert.assertEquals( "do1() in Beanshell:2", domain1.do1() );
- Assert.assertEquals( "do1() in Beanshell:3", domain1.do1() );
- Assert.assertEquals( "do1() in Beanshell:4", domain1.do1() );
- Assert.assertEquals( "do1() in Beanshell:1", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:2", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:3", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:4", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:5", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:6", domain2.do1() );
- Assert.assertEquals( "do1() in Beanshell:5", domain1.do1() );
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java
deleted file mode 100644
index 893891e..0000000
--- a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/HelloSpeaker.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2007 Rickard Öberg
- * Licensed 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.qi4j.lang.beanshell;
-
-import org.qi4j.api.mixin.Mixins;
-
-// START SNIPPET: mixin
-import org.qi4j.lang.beanshell.BeanShellMixin;
-
-@Mixins(BeanShellMixin.class)
-public interface HelloSpeaker
-{
- void sayHello();
-}
-// END SNIPPET: mixin
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/Mixin1.java
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/Mixin1.java b/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/Mixin1.java
deleted file mode 100644
index bab518a..0000000
--- a/libraries/lang-beanshell/src/test/java/org/qi4j/lang/beanshell/Mixin1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.qi4j.lang.beanshell;
-
-public interface Mixin1
-{
- String do1();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh
----------------------------------------------------------------------
diff --git a/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh b/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh
deleted file mode 100644
index fc2b16b..0000000
--- a/libraries/lang-beanshell/src/test/resources/org/qi4j/lang/beanshell/BeanShellComposite.bsh
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2007 Rickard Öberg
- * Licensed 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.qi4j.lang.beanshell.Mixin1;
-
-public class Mixin1Impl
- implements Mixin1
-{
- private int counter;
-
- public String do1()
- {
- counter++;
- return "do1() in Beanshell:" + counter;
- }
-}
\ No newline at end of file
[2/5] zest-qi4j git commit: Have to remove lang-jruby and
lang-beanshell due to Licensing restrictions of ASF.
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/060bb358/libraries/lang-jruby/NOTICE
----------------------------------------------------------------------
diff --git a/libraries/lang-jruby/NOTICE b/libraries/lang-jruby/NOTICE
deleted file mode 100644
index 68d2ae7..0000000
--- a/libraries/lang-jruby/NOTICE
+++ /dev/null
@@ -1,2153 +0,0 @@
-Qi4j Script Library - JRuby
-Copyright 2007-2008, The Qi4j Development Team of individuals.
-
-See http://www.qi4j.org/contributors.html for list of of individuals.
-Also see each file for additional information of Copyright claims.
-
-Qi4j is a community aggregated works under Copyright law.
-All parts of the original works at Qi4j is licensed under the
-Apache License ver 2.0 http://www.apache.org/licenses
-
-Below follows a list of binary dependencies and their licenses;
-----------------------------------------------------------------
-
-This module contains JRuby, software developed at http://jruby.org
-and avaiable under CPL, GPL and LGPL. The text below is from
-JRuby's COPYING information. Additional license information is
-available in licenses/jruby.license
-
-JRuby is Copyright (c) 2007-2010 The JRuby project, and is released
-under a tri CPL/GPL/LGPL license. You can use it, redistribute it
-and/or modify it under the terms of the:
-
- Common Public License version 1.0
- GNU General Public License version 2
- GNU Lesser General Public License version 2.1
-
-lib/ruby/1.9/drb/*, build_lib/bytelist.jar
-(http://github.com/jruby/bytelist), build_lib/jruby-embed.jar
-(http://kenai.com/projects/jruby-embed) and build_lib/yydebug.jar
-(http://svn.codehaus.org/jruby/trunk/jay/yydebug) are released under
-the same copyright/license.
-
-Some additional libraries distributed with JRuby are not covered by
-JRuby's licence. Most of these libraries and their licenses are listed
-below. Also see LICENSE.RUBY for most files found in src/lib/ruby/1.8.
-
- bench/rails/public/javascripts/* are distributed under the MIT
- license, and have the following copyrights:
-
- controls.js is Copyright:
- (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
- (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
- (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
-
- dragdrop.js is Copyright:
- (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
- (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-
- effect.js is Copyright (c) 2005-2008 Thomas Fuchs.
-
- prototype.js is Copyright (c) 2005-2007 Sam Stephenson.
-
- build_lib/*asm*jar (http://asm.objectweb.org) are distributed under the BSD license.
-
- build_lib/apt-mirror-api.jar, build_lib/bnd-0.0.249.jar,
- build_lib/commons-logging-1.1.1.jar, build_lib/joda-time-1.5.1.jar,
- BSF and ant are distributed under the Apache Software License,
- Version 1.1 (license file inside the jars).
-
- build_lib/constantine.jar (http://kenai.com/projects/constantine),
- build_lib/jcodings.jar (http://github.com/jruby/jcodings),
- build_lib/jaffl.jar (http://projectkenai.com/projects/jaffl) and
- build_lib/joni.jar (http://github.com/jruby/joni) are distributed
- under the MIT license.
-
- build_lib/jarjar-1.0rc8.jar (http://code.google.com/p/jarjar),
- build_lib/joda-time-1.5.1.jar (http://joda-time.sourceforge.net),
- build_lib/dynalang-0.3.jar (http://dynalang.sourceforge.net),
- build_lib/nailgun-0.7.1.jar and tool/nailgun/ng.exe
- (http://martiansoftware.com/nailgun) are distributed under the
- Apache License version 2.0.
-
- build_lib/emma*jar (http://emma.sourceforge.net) and
- build_lib/junit.jar (http://www.junit.org) are distributed under the
- Common Public License v1.0.
-
- build_lib/jffi*jar (http://kenai.com/projects/jffi) and
- build_lib/jgrapht-jdk1.5.jar (http://jgrapht.sourceforge.net) are
- distributed under the GPL v3.
-
- build_lib/jline-0.9.93 (http://jline.sourceforge.net) is distributed
- under the following license:
-
- Redistribution and use in source and binary forms, with or
- without modification, are permitted provided that the following
- conditions are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with
- the distribution.
-
- Neither the name of JLine nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- build_lib/jna*jar (http://jna.dev.java.net) are distributed
- under the LGPL-2.1+ license.
-
- build_lib/invokedynamic.jar and build_lib/jsr292-mock.jar
- (http://code.google.com/p/jvm-language-runtime) are distributed
- under the LGPL license.
-
- Bouncycastle is released under the MIT license, and is Copyright (c)
- 2000 - 2006 The Legion Of The Bouncy Castle.
-
- Jyvaml and rbyaml are released under the MIT license, and are
- Copyright (c) 2006 Ola Bini.
-
-The complete text of the Common Public License is as follows:
-
- Common Public License - v 1.0
-
- THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
- PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
- THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
- 1. DEFINITIONS
-
- "Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate
- from and are distributed by that particular Contributor. A
- Contribution 'originates' from a Contributor if it was added to the
- Program by such Contributor itself or anyone acting on such
- Contributor's behalf. Contributions do not include additions to the
- Program which: (i) are separate modules of software distributed in
- conjunction with the Program under their own license agreement,
- and (ii) are not derivative works of the Program.
-
- "Contributor" means any person or entity that distributes the Program.
-
- "Licensed Patents " mean patent claims licensable by a Contributor
- which are necessarily infringed by the use or sale of its Contribution
- alone or when combined with the Program.
-
- "Program" means the Contributions distributed in accordance with this Agreement.
-
- "Recipient" means anyone who receives the Program under this
- Agreement, including all Contributors.
-
- 2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor
- hereby grants Recipient a non-exclusive, worldwide, royalty-free
- copyright license to reproduce, prepare derivative works of, publicly
- display, publicly perform, distribute and sublicense the Contribution
- of such Contributor, if any, and such derivative works, in source code
- and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor
- hereby grants Recipient a non-exclusive, worldwide, royalty-free
- patent license under Licensed Patents to make, use, sell, offer to
- sell, import and otherwise transfer the Contribution of such
- Contributor, if any, in source code and object code form. This patent
- license shall apply to the combination of the Contribution and the
- Program if, at the time the Contribution is added by the Contributor,
- such addition of the Contribution causes such combination to be
- covered by the Licensed Patents. The patent license shall not apply to
- any other combinations which include the Contribution. No hardware per
- se is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants
- the licenses to its Contributions set forth herein, no assurances are
- provided by any Contributor that the Program does not infringe the
- patent or other intellectual property rights of any other entity. Each
- Contributor disclaims any liability to Recipient for claims brought by
- any other entity based on infringement of intellectual property rights
- or otherwise. As a condition to exercising the rights and licenses
- granted hereunder, each Recipient hereby assumes sole responsibility
- to secure any other intellectual property rights needed, if any. For
- example, if a third party patent license is required to allow
- Recipient to distribute the Program, it is Recipient's responsibility
- to acquire that license before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has
- sufficient copyright rights in its Contribution, if any, to grant the
- copyright license set forth in this Agreement.
-
- 3. REQUIREMENTS
-
- A Contributor may choose to distribute the Program in object code form
- under its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement;
- and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all
- warranties and conditions, express and implied, including warranties
- or conditions of title and non-infringement, and implied warranties or
- conditions of merchantability and fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all
- liability for damages, including direct, indirect, special, incidental
- and consequential damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement
- are offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from
- such Contributor, and informs licensees how to obtain it in a
- reasonable manner on or through a medium customarily used for software
- exchange.
-
- When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of
- the Program.
-
- Contributors may not remove or alter any copyright notices contained
- within the Program.
-
- Each Contributor must identify itself as the originator of its
- Contribution, if any, in a manner that reasonably allows subsequent
- Recipients to identify the originator of the Contribution.
-
- 4. COMMERCIAL DISTRIBUTION
-
- Commercial distributors of software may accept certain
- responsibilities with respect to end users, business partners and the
- like. While this license is intended to facilitate the commercial use
- of the Program, the Contributor who includes the Program in a
- commercial product offering should do so in a manner which does not
- create potential liability for other Contributors. Therefore, if a
- Contributor includes the Program in a commercial product offering,
- such Contributor ("Commercial Contributor") hereby agrees to defend
- and indemnify every other Contributor ("Indemnified Contributor")
- against any losses, damages and costs (collectively "Losses") arising
- from claims, lawsuits and other legal actions brought by a third party
- against the Indemnified Contributor to the extent caused by the acts
- or omissions of such Commercial Contributor in connection with its
- distribution of the Program in a commercial product offering. The
- obligations in this section do not apply to any claims or Losses
- relating to any actual or alleged intellectual property
- infringement. In order to qualify, an Indemnified Contributor must: a)
- promptly notify the Commercial Contributor in writing of such claim,
- and b) allow the Commercial Contributor to control, and cooperate with
- the Commercial Contributor in, the defense and any related settlement
- negotiations. The Indemnified Contributor may participate in any such
- claim at its own expense.
-
- For example, a Contributor might include the Program in a commercial
- product offering, Product X. That Contributor is then a Commercial
- Contributor. If that Commercial Contributor then makes performance
- claims, or offers warranties related to Product X, those performance
- claims and warranties are such Commercial Contributor's responsibility
- alone. Under this section, the Commercial Contributor would have to
- defend claims against the other Contributors related to those
- performance claims and warranties, and if a court requires any other
- Contributor to pay any damages as a result, the Commercial Contributor
- must pay those damages.
-
- 5. NO WARRANTY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
- PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
- WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
- OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
- responsible for determining the appropriateness of using and
- distributing the Program and assumes all risks associated with its
- exercise of rights under this Agreement, including but not limited to
- the risks and costs of program errors, compliance with applicable
- laws, damage to or loss of data, programs or equipment, and
- unavailability or interruption of operations.
-
- 6. DISCLAIMER OF LIABILITY
-
- EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
- ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
- WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
- DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
- HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
- 7. GENERAL
-
- If any provision of this Agreement is invalid or unenforceable under
- applicable law, it shall not affect the validity or enforceability of
- the remainder of the terms of this Agreement, and without further
- action by the parties hereto, such provision shall be reformed to the
- minimum extent necessary to make such provision valid and enforceable.
-
- If Recipient institutes patent litigation against a Contributor with
- respect to a patent applicable to software (including a cross-claim or
- counterclaim in a lawsuit), then any patent licenses granted by that
- Contributor to such Recipient under this Agreement shall terminate as
- of the date such litigation is filed. In addition, if Recipient
- institutes patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Program
- itself (excluding combinations of the Program with other software or
- hardware) infringes such Recipient's patent(s), then such Recipient's
- rights granted under Section 2(b) shall terminate as of the date such
- litigation is filed.
-
- All Recipient's rights under this Agreement shall terminate if it
- fails to comply with any of the material terms or conditions of this
- Agreement and does not cure such failure in a reasonable period of
- time after becoming aware of such noncompliance. If all Recipient's
- rights under this Agreement terminate, Recipient agrees to cease use
- and distribution of the Program as soon as reasonably
- practicable. However, Recipient's obligations under this Agreement and
- any licenses granted by Recipient relating to the Program shall
- continue and survive.
-
- Everyone is permitted to copy and distribute copies of this Agreement,
- but in order to avoid inconsistency the Agreement is copyrighted and
- may only be modified in the following manner. The Agreement Steward
- reserves the right to publish new versions (including revisions) of
- this Agreement from time to time. No one other than the Agreement
- Steward has the right to modify this Agreement. IBM is the initial
- Agreement Steward. IBM may assign the responsibility to serve as the
- Agreement Steward to a suitable separate entity. Each new version of
- the Agreement will be given a distinguishing version number. The
- Program (including Contributions) may always be distributed subject to
- the version of the Agreement under which it was received. In addition,
- after a new version of the Agreement is published, Contributor may
- elect to distribute the Program (including its Contributions) under
- the new version. Except as expressly stated in Sections 2(a) and 2(b)
- above, Recipient receives no rights or licenses to the intellectual
- property of any Contributor under this Agreement, whether expressly,
- by implication, estoppel or otherwise. All rights in the Program not
- expressly granted under this Agreement are reserved.
-
- This Agreement is governed by the laws of the State of New York and
- the intellectual property laws of the United States of America. No
- party to this Agreement will bring a legal action under this Agreement
- more than one year after the cause of action arose. Each party waives
- its rights to a jury trial in any resulting litigation.
-
-The complete text of the GNU General Public License v2 is as follows:
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
- freedom to share and change it. By contrast, the GNU General Public
- License is intended to guarantee your freedom to share and change free
- software--to make sure the software is free for all its users. This
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it. (Some other Free Software Foundation software is covered by
- the GNU Library General Public License instead.) You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- this service if you wish), that you receive source code or can get it
- if you want it, that you can change the software or use pieces of it
- in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
- anyone to deny you these rights or to ask you to surrender the rights.
- These restrictions translate to certain responsibilities for you if you
- distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must give the recipients all the rights that
- you have. You must make sure that they, too, receive or can get the
- source code. And you must show them these terms so they know their
- rights.
-
- We protect your rights with two steps: (1) copyright the software, and
- (2) offer you this license which gives you legal permission to copy,
- distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
- that everyone understands that there is no warranty for this free
- software. If the software is modified by someone else and passed on, we
- want its recipients to know that what they have is not the original, so
- that any problems introduced by others will not reflect on the original
- authors' reputations.
-
- Finally, any free program is threatened constantly by software
- patents. We wish to avoid the danger that redistributors of a free
- program will individually obtain patent licenses, in effect making the
- program proprietary. To prevent this, we have made it clear that any
- patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
- modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
- a notice placed by the copyright holder saying it may be distributed
- under the terms of this General Public License. The "Program", below,
- refers to any such program or work, and a "work based on the Program"
- means either the Program or any derivative work under copyright law:
- that is to say, a work containing the Program or a portion of it,
- either verbatim or with modifications and/or translated into another
- language. (Hereinafter, translation is included without limitation in
- the term "modification".) Each licensee is addressed as "you".
-
- Activities other than copying, distribution and modification are not
- covered by this License; they are outside its scope. The act of
- running the Program is not restricted, and the output from the Program
- is covered only if its contents constitute a work based on the
- Program (independent of having been made by running the Program).
- Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
- source code as you receive it, in any medium, provided that you
- conspicuously and appropriately publish on each copy an appropriate
- copyright notice and disclaimer of warranty; keep intact all the
- notices that refer to this License and to the absence of any warranty;
- and give any other recipients of the Program a copy of this License
- along with the Program.
-
- You may charge a fee for the physical act of transferring a copy, and
- you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
- of it, thus forming a work based on the Program, and copy and
- distribute such modifications or work under the terms of Section 1
- above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the Program,
- and can be reasonably considered independent and separate works in
- themselves, then this License, and its terms, do not apply to those
- sections when you distribute them as separate works. But when you
- distribute the same sections as part of a whole which is a work based
- on the Program, the distribution of the whole must be on the terms of
- this License, whose permissions for other licensees extend to the
- entire whole, and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest
- your rights to work written entirely by you; rather, the intent is to
- exercise the right to control the distribution of derivative or
- collective works based on the Program.
-
- In addition, mere aggregation of another work not based on the Program
- with the Program (or with a work based on the Program) on a volume of
- a storage or distribution medium does not bring the other work under
- the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
- under Section 2) in object code or executable form under the terms of
- Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
- The source code for a work means the preferred form of the work for
- making modifications to it. For an executable work, complete source
- code means all the source code for all modules it contains, plus any
- associated interface definition files, plus the scripts used to
- control compilation and installation of the executable. However, as a
- special exception, the source code distributed need not include
- anything that is normally distributed (in either source or binary
- form) with the major components (compiler, kernel, and so on) of the
- operating system on which the executable runs, unless that component
- itself accompanies the executable.
-
- If distribution of executable or object code is made by offering
- access to copy from a designated place, then offering equivalent
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License. Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
- void, and will automatically terminate your rights under this License.
- However, parties who have received copies, or rights, from you under
- this License will not have their licenses terminated so long as such
- parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to modify or
- distribute the Program or its derivative works. These actions are
- prohibited by law if you do not accept this License. Therefore, by
- modifying or distributing the Program (or any work based on the
- Program), you indicate your acceptance of this License to do so, and
- all its terms and conditions for copying, distributing or modifying
- the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
- Program), the recipient automatically receives a license from the
- original licensor to copy, distribute or modify the Program subject to
- these terms and conditions. You may not impose any further
- restrictions on the recipients' exercise of the rights granted herein.
- You are not responsible for enforcing compliance by third parties to
- this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues),
- conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot
- distribute so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you
- may not distribute the Program at all. For example, if a patent
- license would not permit royalty-free redistribution of the Program by
- all those who receive copies directly or indirectly through you, then
- the only way you could satisfy both it and this License would be to
- refrain entirely from distribution of the Program.
-
- If any portion of this section is held invalid or unenforceable under
- any particular circumstance, the balance of the section is intended to
- apply and the section as a whole is intended to apply in other
- circumstances.
-
- It is not the purpose of this section to induce you to infringe any
- patents or other property right claims or to contest validity of any
- such claims; this section has the sole purpose of protecting the
- integrity of the free software distribution system, which is
- implemented by public license practices. Many people have made
- generous contributions to the wide range of software distributed
- through that system in reliance on consistent application of that
- system; it is up to the author/donor to decide if he or she is willing
- to distribute software through any other system and a licensee cannot
- impose that choice.
-
- This section is intended to make thoroughly clear what is believed to
- be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Program under this License
- may add an explicit geographical distribution limitation excluding
- those countries, so that distribution is permitted only in or among
- countries not thus excluded. In such case, this License incorporates
- the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
- of the General Public License from time to time. Such new versions will
- be similar in spirit to the present version, but may differ in detail to
- address new problems or concerns.
-
- Each version is given a distinguishing version number. If the Program
- specifies a version number of this License which applies to it and "any
- later version", you have the option of following the terms and conditions
- either of that version or of any later version published by the Free
- Software Foundation. If the Program does not specify a version number of
- this License, you may choose any version ever published by the Free Software
- Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
- programs whose distribution conditions are different, write to the author
- to ask for permission. For software which is copyrighted by the Free
- Software Foundation, write to the Free Software Foundation; we sometimes
- make exceptions for this. Our decision will be guided by the two goals
- of preserving the free status of all derivatives of our free software and
- of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
- OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
- PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
- OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
- TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
- PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
- REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
- REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
- INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
- OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
- TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
- YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
-The complete text of the GNU Lesser General Public License 2.1 is as follows:
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- [This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
- freedom to share and change it. By contrast, the GNU General Public
- Licenses are intended to guarantee your freedom to share and change
- free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
- specially designated software packages--typically libraries--of the
- Free Software Foundation and other authors who decide to use it. You
- can use it too, but we suggest you first think carefully about whether
- this license or the ordinary General Public License is the better
- strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
- not price. Our General Public Licenses are designed to make sure that
- you have the freedom to distribute copies of free software (and charge
- for this service if you wish); that you receive source code or can get
- it if you want it; that you can change the software and use pieces of
- it in new free programs; and that you are informed that you can do
- these things.
-
- To protect your rights, we need to make restrictions that forbid
- distributors to deny you these rights or to ask you to surrender these
- rights. These restrictions translate to certain responsibilities for
- you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
- or for a fee, you must give the recipients all the rights that we gave
- you. You must make sure that they, too, receive or can get the source
- code. If you link other code with the library, you must provide
- complete object files to the recipients, so that they can relink them
- with the library after making changes to the library and recompiling
- it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
- library, and (2) we offer you this license, which gives you legal
- permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
- there is no warranty for the free library. Also, if the library is
- modified by someone else and passed on, the recipients should know
- that what they have is not the original version, so that the original
- author's reputation will not be affected by problems that might be
- introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
- any free program. We wish to make sure that a company cannot
- effectively restrict the users of a free program by obtaining a
- restrictive license from a patent holder. Therefore, we insist that
- any patent license obtained for a version of the library must be
- consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
- ordinary GNU General Public License. This license, the GNU Lesser
- General Public License, applies to certain designated libraries, and
- is quite different from the ordinary General Public License. We use
- this license for certain libraries in order to permit linking those
- libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
- a shared library, the combination of the two is legally speaking a
- combined work, a derivative of the original library. The ordinary
- General Public License therefore permits such linking only if the
- entire combination fits its criteria of freedom. The Lesser General
- Public License permits more lax criteria for linking other code with
- the library.
-
- We call this license the "Lesser" General Public License because it
- does Less to protect the user's freedom than the ordinary General
- Public License. It also provides other free software developers Less
- of an advantage over competing non-free programs. These disadvantages
- are the reason we use the ordinary General Public License for many
- libraries. However, the Lesser license provides advantages in certain
- special circumstances.
-
- For example, on rare occasions, there may be a special need to
- encourage the widest possible use of a certain library, so that it becomes
- a de-facto standard. To achieve this, non-free programs must be
- allowed to use the library. A more frequent case is that a free
- library does the same job as widely used non-free libraries. In this
- case, there is little to gain by limiting the free library to free
- software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
- programs enables a greater number of people to use a large body of
- free software. For example, permission to use the GNU C Library in
- non-free programs enables many more people to use the whole GNU
- operating system, as well as its variant, the GNU/Linux operating
- system.
-
- Although the Lesser General Public License is Less protective of the
- users' freedom, it does ensure that the user of a program that is
- linked with the Library has the freedom and the wherewithal to run
- that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
- modification follow. Pay close attention to the difference between a
- "work based on the library" and a "work that uses the library". The
- former contains code derived from the library, whereas the latter must
- be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
- program which contains a notice placed by the copyright holder or
- other authorized party saying it may be distributed under the terms of
- this Lesser General Public License (also called "this License").
- Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
- prepared so as to be conveniently linked with application programs
- (which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
- which has been distributed under these terms. A "work based on the
- Library" means either the Library or any derivative work under
- copyright law: that is to say, a work containing the Library or a
- portion of it, either verbatim or with modifications and/or translated
- straightforwardly into another language. (Hereinafter, translation is
- included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
- making modifications to it. For a library, complete source code means
- all the source code for all modules it contains, plus any associated
- interface definition files, plus the scripts used to control compilation
- and installation of the library.
-
- Activities other than copying, distribution and modification are not
- covered by this License; they are outside its scope. The act of
- running a program using the Library is not restricted, and output from
- such a program is covered only if its contents constitute a work based
- on the Library (independent of the use of the Library in a tool for
- writing it). Whether that is true depends on what the Library does
- and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
- complete source code as you receive it, in any medium, provided that
- you conspicuously and appropriately publish on each copy an
- appropriate copyright notice and disclaimer of warranty; keep intact
- all the notices that refer to this License and to the absence of any
- warranty; and distribute a copy of this License along with the
- Library.
-
- You may charge a fee for the physical act of transferring a copy,
- and you may at your option offer warranty protection in exchange for a
- fee.
-
- 2. You may modify your copy or copies of the Library or any portion
- of it, thus forming a work based on the Library, and copy and
- distribute such modifications or work under the terms of Section 1
- above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the Library,
- and can be reasonably considered independent and separate works in
- themselves, then this License, and its terms, do not apply to those
- sections when you distribute them as separate works. But when you
- distribute the same sections as part of a whole which is a work based
- on the Library, the distribution of the whole must be on the terms of
- this License, whose permissions for other licensees extend to the
- entire whole, and thus to each and every part regardless of who wrote
- it.
-
- Thus, it is not the intent of this section to claim rights or contest
- your rights to work written entirely by you; rather, the intent is to
- exercise the right to control the distribution of derivative or
- collective works based on the Library.
-
- In addition, mere aggregation of another work not based on the Library
- with the Library (or with a work based on the Library) on a volume of
- a storage or distribution medium does not bring the other work under
- the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
- License instead of this License to a given copy of the Library. To do
- this, you must alter all the notices that refer to this License, so
- that they refer to the ordinary GNU General Public License, version 2,
- instead of to this License. (If a newer version than version 2 of the
- ordinary GNU General Public License has appeared, then you can specify
- that version instead if you wish.) Do not make any other change in
- these notices.
-
- Once this change is made in a given copy, it is irreversible for
- that copy, so the ordinary GNU General Public License applies to all
- subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
- the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
- derivative of it, under Section 2) in object code or executable form
- under the terms of Sections 1 and 2 above provided that you accompany
- it with the complete corresponding machine-readable source code, which
- must be distributed under the terms of Sections 1 and 2 above on a
- medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
- from a designated place, then offering equivalent access to copy the
- source code from the same place satisfies the requirement to
- distribute the source code, even though third parties are not
- compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
- Library, but is designed to work with the Library by being compiled or
- linked with it, is called a "work that uses the Library". Such a
- work, in isolation, is not a derivative work of the Library, and
- therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
- creates an executable that is a derivative of the Library (because it
- contains portions of the Library), rather than a "work that uses the
- library". The executable is therefore covered by this License.
- Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
- that is part of the Library, the object code for the work may be a
- derivative work of the Library even though the source code is not.
- Whether this is true is especially significant if the work can be
- linked without the Library, or if the work is itself a library. The
- threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
- structure layouts and accessors, and small macros and small inline
- functions (ten lines or less in length), then the use of the object
- file is unrestricted, regardless of whether it is legally a derivative
- work. (Executables containing this object code plus portions of the
- Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
- distribute the object code for the work under the terms of Section 6.
- Any executables containing that work also fall under Section 6,
- whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
- link a "work that uses the Library" with the Library to produce a
- work containing portions of the Library, and distribute that work
- under terms of your choice, provided that the terms permit
- modification of the work for the customer's own use and reverse
- engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
- Library is used in it and that the Library and its use are covered by
- this License. You must supply a copy of this License. If the work
- during execution displays copyright notices, you must include the
- copyright notice for the Library among them, as well as a reference
- directing the user to the copy of this License. Also, you must do one
- of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
- Library" must include any data and utility programs needed for
- reproducing the executable from it. However, as a special exception,
- the materials to be distributed need not include anything that is
- normally distributed (in either source or binary form) with the major
- components (compiler, kernel, and so on) of the operating system on
- which the executable runs, unless that component itself accompanies
- the executable.
-
- It may happen that this requirement contradicts the license
- restrictions of other proprietary libraries that do not normally
- accompany the operating system. Such a contradiction means you cannot
- use both them and the Library together in an executable that you
- distribute.
-
- 7. You may place library facilities that are a work based on the
- Library side-by-side in a single library together with other library
- facilities not covered by this License, and distribute such a combined
- library, provided that the separate distribution of the work based on
- the Library and of the other library facilities is otherwise
- permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
- the Library except as expressly provided under this License. Any
- attempt otherwise to copy, modify, sublicense, link with, or
- distribute the Library is void, and will automatically terminate your
- rights under this License. However, parties who have received copies,
- or rights, from you under this License will not have their licenses
- terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to modify or
- distribute the Library or its derivative works. These actions are
- prohibited by law if you do not accept this License. Therefore, by
- modifying or distributing the Library (or any work based on the
- Library), you indicate your acceptance of this License to do so, and
- all its terms and conditions for copying, distributing or modifying
- the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
- Library), the recipient automatically receives a license from the
- original licensor to copy, distribute, link with or modify the Library
- subject to these terms and conditions. You may not impose any further
- restrictions on the recipients' exercise of the rights granted herein.
- You are not responsible for enforcing compliance by third parties with
- this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
- infringement or for any other reason (not limited to patent issues),
- conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot
- distribute so as to satisfy simultaneously your obligations under this
- License and any other pertinent obligations, then as a consequence you
- may not distribute the Library at all. For example, if a patent
- license would not permit royalty-free redistribution of the Library by
- all those who receive copies directly or indirectly through you, then
- the only way you could satisfy both it and this License would be to
- refrain entirely from distribution of the Library.
-
- If any portion of this section is held invalid or unenforceable under any
- particular circumstance, the balance of the section is intended to apply,
- and the section as a whole is intended to apply in other circumstances.
-
- It is not the purpose of this section to induce you to infringe any
- patents or other property right claims or to contest validity of any
- such claims; this section has the sole purpose of protecting the
- integrity of the free software distribution system which is
- implemented by public license practices. Many people have made
- generous contributions to the wide range of software distributed
- through that system in reliance on consistent application of that
- system; it is up to the author/donor to decide if he or she is willing
- to distribute software through any other system and a licensee cannot
- impose that choice.
-
- This section is intended to make thoroughly clear what is believed to
- be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Library under this License may add
- an explicit geographical distribution limitation excluding those countries,
- so that distribution is permitted only in or among countries not thus
- excluded. In such case, this License incorporates the limitation as if
- written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
- versions of the Lesser General Public License from time to time.
- Such new versions will be similar in spirit to the present version,
- but may differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the Library
- specifies a version number of this License which applies to it and
- "any later version", you have the option of following the terms and
- conditions either of that version or of any later version published by
- the Free Software Foundation. If the Library does not specify a
- license version number, you may choose any version ever published by
- the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
- programs whose distribution conditions are incompatible with these,
- write to the author to ask for permission. For software which is
- copyrighted by the Free Software Foundation, write to the Free
- Software Foundation; we sometimes make exceptions for this. Our
- decision will be guided by the two goals of preserving the free status
- of all derivatives of our free software and of promoting the sharing
- and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
- WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
- EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
- OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
- KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
- LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
- THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
- WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
- AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
- FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
- LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
- RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
- FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
- SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
- possible use to the public, we recommend making it free software that
- everyone can redistribute and change. You can do so by permitting
- redistribution under these terms (or, alternatively, under the terms of the
- ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
- safest to attach them to the start of each source file to most effectively
- convey the exclusion of warranty; and each file should have at least the
- "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- Also add information on how to contact you by electronic and paper mail.
-
- You should also get your employer (if you work as a programmer) or your
- school, if any, to sign a "copyright disclaimer" for the library, if
- necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
- That's all there is to it!
-
-The following licenses cover code other than JRuby which is included with JRuby.
-
-Licenses listed below include:
-
-* GNU General Public License version 3
-* Apache 2.0 License
-* BSD License
-* Apache Software License Version 1.1
-* MIT License
-
-The complete text of the GNU General Public License version 3 is as follows:
-
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
- software and other kinds of works.
-
- The licenses for most software and other practical works are designed
- to take away your freedom to share and change the works. By contrast,
- the GNU General Public License is intended to guarantee your freedom to
- share and change all versions of a program--to make sure it remains free
- software for all its users. We, the Free Software Foundation, use the
- GNU General Public License for most of our software; it applies also to
- any other work released this way by its authors. You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not
- price. Our General Public Licenses are designed to make sure that you
- have the freedom to distribute copies of free software (and charge for
- them if you wish), that you receive source code or can get it if you
- want it, that you can change the software or use pieces of it in new
- free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
- these rights or asking you to surrender the rights. Therefore, you have
- certain responsibilities if you distribute copies of the software, or if
- you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
- gratis or for a fee, you must pass on to the recipients the same
- freedoms that you received. You must make sure that they, too, receive
- or can get the source code. And you must show them these terms so they
- know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
- (1) assert copyright on the software, and (2) offer you this License
- giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
- that there is no warranty for this free software. For both users' and
- authors' sake, the GPL requires that modified versions be marked as
- changed, so that their problems will not be attributed erroneously to
- authors of previous versions.
-
- Some devices are designed to deny users access to install or run
- modified versions of the software inside them, although the manufacturer
- can do so. This is fundamentally incompatible with the aim of
- protecting users' freedom to change the software. The systematic
- pattern of such abuse occurs in the area of products for individuals to
- use, which is precisely where it is most unacceptable. Therefore, we
- have designed this version of the GPL to prohibit the practice for those
- products. If such problems arise substantially in other domains, we
- stand ready to extend this provision to those domains in future versions
- of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
- States should not allow patents to restrict development and use of
- software on general-purpose computers, but in those that do, we wish to
- avoid the special danger that patents applied to a free program could
- make it effectively proprietary. To prevent this, the GPL assures that
- patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
- modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
- works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
- License. Each licensee is addressed as "you". "Licensees" and
- "recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
- in a fashion requiring copyright permission, other than the making of an
- exact copy. The resulting work is called a "modified version" of the
- earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
- on the Program.
-
- To "propagate" a work means to do anything with it that, without
- permission, would make you directly or secondarily liable for
- infringement under applicable copyright law, except executing it on a
- computer or modifying a private copy. Propagation includes copying,
- distribution (with or without modification), making available to the
- public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
- parties to make or receive copies. Mere interaction with a user through
- a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
- to the extent that it includes a convenient and prominently visible
- feature that (1) displays an appropriate copyright notice, and (2)
- tells the user that there is no warranty for the work (except to the
- extent that warranties are provided), that licensees may convey the
- work under this License, and how to view a copy of this License. If
- the interface presents a list of user commands or options, such as a
- menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
- for making modifications to it. "Object code" means any non-source
- form of a work.
-
- A "Standard Interface" means an interface that either is an official
- standard defined by a recognized standards body, or, in the case of
- interfaces specified for a particular programming language, one that
- is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
- than the work as a whole, that (a) is included in the normal form of
- packaging a Major Component, but which is not part of that Major
- Component, and (b) serves only to enable use of the work with that
- Major Component, or to implement a Standard Interface for which an
- implementation is available to the public in source code form. A
- "Major Component", in this context, means a major essential component
- (kernel, window system, and so on) of the specific operating system
- (if any) on which the executable work runs, or a compiler used to
- produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
- the source code needed to generate, install, and (for an executable
- work) run the object code and to modify the work, including scripts to
- control those activities. However, it does not include the work's
- System Libraries, or general-purpose tools or generally available free
- programs which are used unmodified in performing those activities but
- which are not part of the work. For example, Corresponding Source
- includes interface definition files associated with source files for
- the work, and the source code for shared libraries and dynamically
- linked subprograms that the work is specifically designed to require,
- such as by intimate data communication or control flow between those
- subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
- can regenerate automatically from other parts of the Corresponding
- Source.
-
- The Corresponding Source for a work in source code form is that
- same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
- copyright on the Program, and are irrevocable provided the stated
- conditions are met. This License explicitly affirms your unlimited
- permission to run the unmodified Program. The output from running a
- covered work is covered by this License only if the output, given its
- content, constitutes a covered work. This License acknowledges your
- rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
- convey, without conditions so long as your license otherwise remains
- in force. You may convey covered works to others for the sole purpose
- of having them make modifications exclusively for you, or provide you
- with facilities for running those works, provided that you comply with
- the terms of this License in conveying all material for which you do
- not control copyright. Those thus making or running the covered works
- for you must do so exclusively on your behalf, under your direction
- and control, on terms that prohibit them from making any copies of
- your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
- the conditions stated below. Sublicensing is not allowed; section 10
- makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
- measure under any applicable law fulfilling obligations under article
- 11 of the WIPO copyright treaty adopted on 20 December 1996, or
- similar laws prohibiting or restricting circumvention of such
- measures.
-
- When you convey a covered work, you waive any legal power to forbid
- circumvention of technological measures to the extent such circumvention
- is effected by exercising rights under this License with respect to
- the covered work, and you disclaim any intention to limit operation or
- modification of the work as a means of enforcing, against the work's
- users, your or third parties' legal rights to forbid circumvention of
- technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
- receive it, in any medium, provided that you conspicuously and
- appropriately publish on each copy an appropriate copyright notice;
- keep intact all notices stating that this License and any
- non-permissive terms added in accord with section 7 apply to the code;
- keep intact all notices of the absence of any warranty; and give all
- recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
- and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
- produce it from the Program, in the form of source code under the
- terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
- works, which are not by their nature extensions of the covered work,
- and which are not combined with it such as to form a larger program,
- in or on a volume of a storage or distribution medium, is called an
- "aggregate" if the compilation and its resulting copyright are not
- used to limit the access or legal rights of the compilation's users
- beyond what the individual works permit. Inclusion of a covered work
- in an aggregate does not cause this License to apply to the other
- parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
- of sections 4 and 5, provided that you also convey the
- machine-readable Corresponding Source under the terms of this License,
- in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
- from the Corresponding Source as a System Library, need not be
- included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
- tangible personal property which is normally used for personal, family,
- or household purposes, or (2) anything designed or sold for incorporation
- into a dwelling. In determining whether a product is a consumer product,
- doubtful cases shall be resolved in favor of coverage. For a particular
- product received by a particular user, "normally used" refers to a
- typical or common use of that class of product, regardless of the status
- of the particular user or of the way in which the particular user
- actually uses, or expects or is expected to use, the product. A product
- is a consumer product regardless of whether the product has substantial
- commercial, industrial or non-consumer uses, unless such uses represent
- the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
- procedures, authorization keys, or other information required to install
- and execute modified versions of a covered work in that User Product from
- a modified version of its Corresponding Source. The information must
- suffice to ensure that the continued functioning of the modified object
- code is in no case prevented or interfered with solely because
- modification has been made.
-
- If you convey an object code work under this section in, or with, or
- specifically for use in, a User Product, and the conveying occurs as
- part of a transaction in which the right of possession and use of the
- User Product is transferred to the recipient in perpetuity or for a
- fixed term (regardless of how the transaction is characterized), the
- Corresponding Source conveyed under this section must be accompanied
- by the Installation Information. But this requirement does not apply
- if neither you nor any third party retains the ability to install
- modified object code on the User Product (for example, the work has
- been installed in ROM).
-
- The requirement to provide Installation Information does not include a
- requirement to continue to provide support service, warranty, or updates
- for a work that has been modified or installed by the recipient, or for
- the User Product in which it has been modified or installed. Access to a
- network may be denied when the modification itself materially and
- adversely affects the operation of the network or violates the rules and
- protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
- in accord with this section must be in a format that is publicly
- documented (and with an implementation available to the public in
- source code form), and must require no special password or key for
- unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
- License by making exceptions from one or more of its conditions.
- Additional permissions that are applicable to the entire Program shall
- be treated as though they were included in this License, to the extent
- that they are valid under applicable law. If additional permissions
- apply only to part of the Program, that part may be used separately
- under those permissions, but the entire Program remains governed by
- this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
- remove any additional permissions from that copy, or from any part of
- it. (Additional permissions may be written to require their own
- removal in certain cases when you modify the work.) You may place
- additional permissions on material, added by you to a covered work,
- for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
- add to a covered work, you may (if authorized by the copyright holders of
- that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
- restrictions" within the meaning of section 10. If the Program as you
- received it, or any part of it, contains a notice stating that it is
- governed by this License along with a term that is a further
- restriction, you may remove that term. If a license document contains
- a further restriction but permits relicensing or conveying under this
- License, you may add to a covered work material governed by the terms
- of that license document, provided that the further restriction does
- not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
- must place, in the relevant source files, a statement of the
- additional terms that apply to those files, or a notice indicating
- where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
- form of a separately written license, or stated as exceptions;
- the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
- provided under this License. Any attempt otherwise to propagate or
- modify it is void, and will automatically terminate your rights under
- this License (including any patent licenses granted under the third
- paragraph of section 11).
-
- However, if you cease all violation of this License, then your
- license from a particular copyright holder is reinstated (a)
- provisionally, unless and until the copyright holder explicitly and
- finally terminates your license, and (b) permanently, if the copyright
- holder fails to notify you of the violation by some reasonable means
- prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
- reinstated permanently if the copyright holder notifies you of the
- violation by some reasonable means, this is the first time you have
- received notice of violation of this License (for any work) from that
- copyright holder, and you cure the violation prior to 30 days after
- your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
- licenses of parties who have received copies or rights from you under
- this License. If your rights have been terminated and not permanently
- reinstated, you do not qualify to receive new licenses for the same
- material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
- run a copy of the Program. Ancillary propagation of a covered work
- occurring solely as a consequence of using peer-to-peer transmission
- to receive a copy likewise does not require acceptance. However,
- nothing other than this License grants you permission to propagate or
- modify any covered work. These actions infringe copyright if you do
- not accept this License. Therefore, by modifying or propagating a
- covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
- receives a license from the original licensors, to run, modify and
- propagate that work, subject to this License. You are not responsible
- for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
- organization, or substantially all assets of one, or subdividing an
- organization, or merging organizations. If propagation of a covered
- work results from an entity transaction, each party to that
- transaction who receives a copy of the work also receives whatever
- licenses to the work the party's predecessor in interest had or could
- give under the previous paragraph, plus a right to possession of the
- Corresponding Source of the work from the predecessor in interest, if
- the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
- rights granted or affirmed under this License. For example, you may
- not impose a license fee, royalty, or other charge for exercise of
- rights granted under this License, and you may not initiate litigation
- (including a cross-claim or counterclaim in a lawsuit) alleging that
- any patent claim is infringed by making, using, selling, offering for
- sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
- License of the Program or a work on which the Program is based. The
- work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
- owned or controlled by the contributor, whether already acquired or
- hereafter acquired, that would be infringed by some manner, permitted
- by this License, of making, using, or selling its contributor version,
- but do not include claims that would be infringed only as a
- consequence of further modification of the contributor version. For
- purposes of this definition, "control" includes the right to grant
- patent sublicenses in a manner consistent with the requirements of
- this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
- patent license under the contributor's essential patent claims, to
- make, use, sell, offer for sale, import and otherwise run, modify and
- propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
- agreement or commitment, however denominated, not to enforce a patent
- (such as an express permission to practice a patent or covenant not to
- sue for patent infringement). To "grant" such a patent license to a
- party means to make such an agreement or commitment not to enforce a
- patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
- and the Corresponding Source of the work is not available for anyone
- to copy, free of charge and under the terms of this License, through a
- publicly available
<TRUNCATED>
[4/5] zest-qi4j git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop
Posted by ni...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/d31b13c2
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/d31b13c2
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/d31b13c2
Branch: refs/heads/develop
Commit: d31b13c25b33a77a7f6ea34fbaff24ce5b7405ff
Parents: 060bb35 e44fb65
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Mon Jun 15 07:42:25 2015 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Mon Jun 15 07:42:25 2015 +0800
----------------------------------------------------------------------
LICENSE.txt | 42 ++++++++++++++++++++++
build.gradle | 29 +++++++++++++---
etc/qi4j-api-checkstyle.xml | 21 +++++++++++
etc/qi4j-runtime-checkstyle.xml | 21 +++++++++++
etc/qi4j-tests-checkstyle.xml | 21 +++++++++++
gradle/wrapper/gradle-wrapper.properties | 2 +-
libraries.gradle | 19 ++++++++++
maven-compat.gradle | 50 ++++++++++++++++++++++-----
settings.gradle | 19 ++++++++++
9 files changed, 210 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d31b13c2/libraries.gradle
----------------------------------------------------------------------
diff --cc libraries.gradle
index 008bf80,59a0047..b9e8d50
--- a/libraries.gradle
+++ b/libraries.gradle
@@@ -1,5 -1,25 +1,24 @@@
+ /*
+ * 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.
+ */
+
// Versions of Dependencies;
def asmVersion = '5.0.3'
-def beanshellVersion = '2.0b4'
def bonecpVersion = '0.8.0.RELEASE'
def bouncyVersion = '1.50'
def c3p0Version = '0.9.1.2'
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d31b13c2/settings.gradle
----------------------------------------------------------------------