deltaspike git commit: DELTASPIKE-1303 List/Set support for @Configuration proxy based interfaces
Repository: deltaspike Updated Branches: refs/heads/master 5685edbf5 -> 7b55ff21d DELTASPIKE-1303 List/Set support for @Configuration proxy based interfaces Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7b55ff21 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7b55ff21 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7b55ff21 Branch: refs/heads/master Commit: 7b55ff21da633b11ac84a6526fce0b64473ca669 Parents: 5685edb Author: Romain Manni-BucauAuthored: Wed Nov 29 11:30:01 2017 +0100 Committer: Romain Manni-Bucau Committed: Wed Nov 29 11:30:01 2017 +0100 -- .../core/api/config/ConfigResolver.java | 13 +- .../config/ProxyConfigurationLifecycle.java | 171 +++ .../core/api/config/injectable/ConfigBean.java | 7 + .../InjectableConfigPropertyTest.java | 3 + 4 files changed, 159 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7b55ff21/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java index f3f8743..9082584 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java @@ -915,7 +915,14 @@ public final class ConfigResolver + keyOriginal); } -defaultValue = convert(value); +if (isList) +{ +defaultValue = splitAndConvertListValue(value); +} +else +{ +defaultValue = convert(value); +} withDefault = true; return this; } @@ -1006,6 +1013,10 @@ public final class ConfigResolver .setEvaluateVariables(evaluateVariables) .setProjectStageAware(projectStageAware); value = fallbackToDefaultIfEmpty(keyResolved, value, defaultValue, configResolverContext); +if (isList && String.class.isInstance(value)) +{ +value = splitAndConvertListValue(String.class.cast(value)); +} } if (logChanges && (value != null && !value.equals(lastValue) || (value == null && lastValue != null)) ) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7b55ff21/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java index 13c687e..4387a11 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java @@ -29,7 +29,12 @@ import javax.enterprise.inject.spi.Bean; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -72,8 +77,8 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle { }; -private final ConcurrentMap resolvers = -new ConcurrentHashMap (); +private final ConcurrentMap resolvers = +new ConcurrentHashMap (); private final long cacheMs; private final String prefix; @@ -98,8 +103,8 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle } } -ConfigResolver.TypedResolver typedResolver = resolvers.get(method); -if (typedResolver == null) +Supplier supplier = resolvers.get(method); +if (supplier == null) { final ConfigProperty annotation =
deltaspike git commit: DELTASPIKE-1296 fixing configuration extension lifecycle
Repository: deltaspike Updated Branches: refs/heads/master f0d56be8f -> 5685edbf5 DELTASPIKE-1296 fixing configuration extension lifecycle Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5685edbf Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5685edbf Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5685edbf Branch: refs/heads/master Commit: 5685edbf58e42baa285198f9b6244d88b82ff7bf Parents: f0d56be Author: Romain Manni-BucauAuthored: Wed Nov 29 10:56:44 2017 +0100 Committer: Romain Manni-Bucau Committed: Wed Nov 29 10:56:44 2017 +0100 -- .../core/impl/config/ConfigurationExtension.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5685edbf/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java index f5be8cc..2d958c2 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java @@ -292,13 +292,20 @@ public class ConfigurationExtension implements Extension, Deactivatable { configSources.addAll(createPropertyConfigSource(propertyFileConfigClass)); } +ConfigResolver.addConfigSources(configSources); + +registerConfigMBean(); + +logConfiguration(); +} +public void validateConfiguration(@Observes AfterDeploymentValidation adv) +{ +List configSources = new ArrayList(cdiSources.size()); for (final Bean bean : cdiSources) { configSources.add(BeanProvider.getContextualReference(ConfigSource.class, bean)); } - -// finally add all ConfigResolver.addConfigSources(configSources); for (final Bean bean : cdiFilters) @@ -306,13 +313,6 @@ public class ConfigurationExtension implements Extension, Deactivatable ConfigResolver.addConfigFilter(BeanProvider.getContextualReference(ConfigFilter.class, bean)); } -registerConfigMBean(); - -logConfiguration(); -} - -public void validateConfiguration(@Observes AfterDeploymentValidation adv) -{ processConfigurationValidation(adv); }
[deltaspike] Git Push Summary
Repository: deltaspike Updated Branches: refs/heads/fb/DELTASPIKE-1302_ThreadPoolManager-configuration [deleted] c4006cc3b
[1/2] deltaspike git commit: DELTASPIKE-1302 configuration for ThreadPoolManager
Repository: deltaspike Updated Branches: refs/heads/master d1316e517 -> 8e27c82fe DELTASPIKE-1302 configuration for ThreadPoolManager Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c4006cc3 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c4006cc3 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c4006cc3 Branch: refs/heads/master Commit: c4006cc3b5fda1eea5551fee5a0a7e15c19264d9 Parents: d1316e5 Author: Romain Manni-BucauAuthored: Sun Nov 26 15:31:46 2017 +0100 Committer: Romain Manni-Bucau Committed: Sun Nov 26 15:31:46 2017 +0100 -- .../core/impl/future/ThreadPoolManager.java | 195 --- .../core/impl/future/ThreadPoolManagerTest.java | 116 +++ documentation/src/main/asciidoc/core.adoc | 26 +++ 3 files changed, 312 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c4006cc3/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java index 9dc6667..4e1f2a1 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/ThreadPoolManager.java @@ -18,23 +18,48 @@ */ package org.apache.deltaspike.core.impl.future; +import org.apache.deltaspike.core.api.config.ConfigResolver; import org.apache.deltaspike.core.api.config.base.CoreBaseConfig; import javax.annotation.PreDestroy; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Set; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import static java.util.Arrays.asList; +import static java.util.Locale.ENGLISH; + @ApplicationScoped public class ThreadPoolManager { private final ConcurrentMap pools = new ConcurrentHashMap (); -private volatile ExecutorService defaultPool; +private final Collection contexts = new ArrayList (8); private volatile boolean closed = false; +@Inject +private BeanManager beanManager; + @PreDestroy private void shutdown() { @@ -43,21 +68,12 @@ public class ThreadPoolManager for (final ExecutorService es : pools.values()) { es.shutdown(); -try -{ -es.awaitTermination(timeout, TimeUnit.MILLISECONDS); -} -catch (final InterruptedException e) -{ -Thread.interrupted(); -} } -if (defaultPool != null) +for (final ExecutorService es : pools.values()) { -defaultPool.shutdown(); try { -defaultPool.awaitTermination(timeout, TimeUnit.MILLISECONDS); +es.awaitTermination(timeout, TimeUnit.MILLISECONDS); } catch (final InterruptedException e) { @@ -65,6 +81,12 @@ public class ThreadPoolManager } } pools.clear(); + +for (final CreationalContext ctx : contexts) +{ +ctx.release(); +} +contexts.clear(); } public ExecutorService find(final String name) @@ -76,25 +98,148 @@ public class ThreadPoolManager ExecutorService pool = pools.get(name); if (pool == null) { -ensureDefaultPool(); -pool = defaultPool; -} -return pool; -} - -private void ensureDefaultPool() -{ -
deltaspike git commit: oops, code style
Repository: deltaspike Updated Branches: refs/heads/master 08c8cb3b5 -> c2fb67f3e oops, code style Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c2fb67f3 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c2fb67f3 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c2fb67f3 Branch: refs/heads/master Commit: c2fb67f3ea20cd9ca0b0933f144a8570de7eebaf Parents: 08c8cb3 Author: rmannibucau <rmannibu...@apache.org> Authored: Tue May 9 12:12:22 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Tue May 9 12:12:22 2017 +0200 -- .../apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c2fb67f3/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java index 99e60a5..e8ff678 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java @@ -540,11 +540,13 @@ public class DynamicMBeanWrapper extends NotificationBroadcasterSupport implemen sendNotification(notification); } -private static class MBeanFeatureInfoSorter implements Comparator { +private static class MBeanFeatureInfoSorter implements Comparator +{ private static final Comparator INSTANCE = new MBeanFeatureInfoSorter(); @Override -public int compare(final T o1, final T o2) { +public int compare(final T o1, final T o2) +{ return o1.getName().compareTo(o2.getName()); } }
deltaspike git commit: sorting our dynamic mbean featureinfo to ease deterministic code without having to map operations etc
Repository: deltaspike Updated Branches: refs/heads/master 6b49da426 -> 08c8cb3b5 sorting our dynamic mbean featureinfo to ease deterministic code without having to map operations etc Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/08c8cb3b Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/08c8cb3b Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/08c8cb3b Branch: refs/heads/master Commit: 08c8cb3b5643b889698c6c2458be1966d1a1d8ab Parents: 6b49da4 Author: rmannibucau <rmannibu...@apache.org> Authored: Tue May 9 12:11:58 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Tue May 9 12:11:58 2017 +0200 -- .../core/impl/jmx/DynamicMBeanWrapper.java | 16 .../test/core/impl/jmx/SimpleRegistrationTest.java | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/08c8cb3b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java index c37585c..99e60a5 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java @@ -40,6 +40,7 @@ import javax.management.ImmutableDescriptor; import javax.management.InvalidAttributeValueException; import javax.management.MBeanAttributeInfo; import javax.management.MBeanException; +import javax.management.MBeanFeatureInfo; import javax.management.MBeanInfo; import javax.management.MBeanNotificationInfo; import javax.management.MBeanOperationInfo; @@ -63,6 +64,8 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -248,6 +251,10 @@ public class DynamicMBeanWrapper extends NotificationBroadcasterSupport implemen clazz = clazz.getSuperclass(); } +Collections.sort(attributeInfos, MBeanFeatureInfoSorter.INSTANCE); +Collections.sort(operationInfos, MBeanFeatureInfoSorter.INSTANCE); +Collections.sort(notificationInfos, MBeanFeatureInfoSorter.INSTANCE); + info = new MBeanInfo(annotatedMBean.getName(), description, attributeInfos.toArray(new MBeanAttributeInfo[attributeInfos.size()]), @@ -532,4 +539,13 @@ public class DynamicMBeanWrapper extends NotificationBroadcasterSupport implemen { sendNotification(notification); } + +private static class MBeanFeatureInfoSorter implements Comparator { +private static final Comparator INSTANCE = new MBeanFeatureInfoSorter(); + +@Override +public int compare(final T o1, final T o2) { +return o1.getName().compareTo(o2.getName()); +} +} } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/08c8cb3b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java index a8ac369..b4f0199 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java @@ -80,8 +80,8 @@ public abstract class SimpleRegistrationTest { MBeanOperationInfo[] operations = mBeanInfo.getOperations(); Assert.assertNotNull(operations); Assert.assertTrue(operations.length > 0); -Assert.assertTrue("Empty Signature on operation: " + operations[0], operations[0].getSignature().length > 0); -MBeanParameterInfo parameterInfo = operations[0].getSignature()[0]; +Assert.assertTrue("Empty Signature on operation: " + operations[1], operations[1].getSignature().length > 0); +MBeanParameterInfo parameterInfo = operations[1].getSignature()[0]; assertEquals("multiplier", parameterInfo.getName()); assertEquals("the multiplier", parameterInfo.getDescription());
deltaspike git commit: DELTASPIKE-1253 handling file path too
Repository: deltaspike Updated Branches: refs/heads/master e7fce70c2 -> e2b54d4db DELTASPIKE-1253 handling file path too Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e2b54d4d Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e2b54d4d Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e2b54d4d Branch: refs/heads/master Commit: e2b54d4db684582e563aaaf5aa09c00cee42e6f7 Parents: e7fce70 Author: rmannibucau <rmannibu...@apache.org> Authored: Tue May 9 11:14:40 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Tue May 9 11:15:02 2017 +0200 -- .../deltaspike/core/util/PropertyFileUtils.java | 13 ++- .../core/util/PropertyFileUtilsTest.java| 107 +++ 2 files changed, 119 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e2b54d4d/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java index 514c2c9..ad9e10b 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java @@ -19,9 +19,11 @@ package org.apache.deltaspike.core.util; import javax.enterprise.inject.Typed; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.Collections; import java.util.Enumeration; import java.util.Locale; import java.util.Properties; @@ -41,7 +43,7 @@ public abstract class PropertyFileUtils public static Enumeration resolvePropertyFiles(String propertyFileName) throws IOException { -if (propertyFileName != null && propertyFileName.contains("://")) +if (propertyFileName != null && (propertyFileName.contains("://") || propertyFileName.startsWith("file:"))) { // the given string is actually already an URL Vector propertyFileUrls = new Vector(); @@ -49,6 +51,15 @@ public abstract class PropertyFileUtils return propertyFileUrls.elements(); } +if (propertyFileName != null) +{ +File file = new File(propertyFileName); +if (file.exists()) +{ +return Collections.enumeration(Collections.singleton(file.toURI().toURL())); +} +} + ClassLoader cl = ClassUtils.getClassLoader(null); Enumeration propertyFileUrls = cl.getResources(propertyFileName); http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e2b54d4d/deltaspike/core/api/src/test/java/org/apache/deltaspike/core/util/PropertyFileUtilsTest.java -- diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/core/util/PropertyFileUtilsTest.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/core/util/PropertyFileUtilsTest.java new file mode 100644 index 000..cde3d5b --- /dev/null +++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/core/util/PropertyFileUtilsTest.java @@ -0,0 +1,107 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.util; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; +import java.util.Enumeration; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +@RunWith(Parameterized.class) +public class PropertyFileUtilsTest +{ +@Parameterized.Para
deltaspike git commit: merging with master
Repository: deltaspike Updated Branches: refs/heads/master 135c59f05 -> a82f6ad27 merging with master Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a82f6ad2 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a82f6ad2 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a82f6ad2 Branch: refs/heads/master Commit: a82f6ad27486756cc6d80d3a2db1695b779e36be Parents: 135c59f Author: rmannibucau <rmannibu...@apache.org> Authored: Tue Apr 25 22:47:28 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Tue Apr 25 22:47:28 2017 +0200 -- .../deltaspike/core/api/jmx/JmxManaged.java | 6 +- .../apache/deltaspike/core/api/jmx/Table.java | 89 .../core/impl/jmx/AttributeAccessor.java| 9 +- .../core/impl/jmx/DynamicMBeanWrapper.java | 49 +++ .../deltaspike/core/impl/jmx/Operation.java | 46 ++ .../deltaspike/test/core/impl/jmx/MyMBean.java | 9 ++ .../core/impl/jmx/SimpleRegistrationTest.java | 42 +++-- 7 files changed, 222 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a82f6ad2/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java index 441df8c..5237e00 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java @@ -47,8 +47,8 @@ public @interface JmxManaged String description() default ""; /** - * @return if {@code true} a Map will be converted to a TabularData with a CompositeData entry, - * if {@code false} the map will be returned directly. + * @return if {@code true} a Map or Table will be converted to a TabularData with a CompositeData entry, + * if {@code false} the Map or Table will be returned directly. */ -boolean convertMapToTabularData() default true; +boolean convertToTabularData() default true; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a82f6ad2/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/Table.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/Table.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/Table.java new file mode 100644 index 000..897e6ad --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/Table.java @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.jmx; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; + +import static java.util.Arrays.asList; + +/** + * Allows to expose in JMX a STRING TabularData without having to built it in the MBean. + * + * Ensure to register columns before the lines. + * + * You just have to type the operation or attribute with this type to expose it as a TabularData. + */ +public class Table +{ +private Collection columns = new ArrayList(); +private Collection<Collection> values = new ArrayList<Collection>(); + +public Table withColumns(final Collection names) +{ +columns.addAll(names); +return this; +} + +public Table withColumns(final String... names) +{ +columns.addAll(asList(names)); +return this; +} + +public Table withLines(final Collection<Collection> lines) +{ +for (final Collection line : lines) +{ +withLine(line); +} +return this; +} + +public Tabl
deltaspike git commit: DELTASPIKE-1246 add support for TabularData in @MBean
Repository: deltaspike Updated Branches: refs/heads/master 4aa12e065 -> 774887693 DELTASPIKE-1246 add support for TabularData in @MBean Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/77488769 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/77488769 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/77488769 Branch: refs/heads/master Commit: 7748876931635172a906808d550cd316342109ac Parents: 4aa12e0 Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Apr 24 13:19:35 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Apr 24 13:19:35 2017 +0200 -- .../deltaspike/core/api/jmx/JmxManaged.java | 5 + .../core/impl/jmx/DynamicMBeanWrapper.java | 96 +++- .../deltaspike/test/core/impl/jmx/MyMBean.java | 12 +++ .../core/impl/jmx/SimpleRegistrationTest.java | 19 +++- 4 files changed, 106 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/77488769/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java index b9f28ae..b383e4e 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/JmxManaged.java @@ -45,4 +45,9 @@ public @interface JmxManaged * @return the description either of the operation or the attribute exported through JMX. */ String description() default ""; + +/** + * @return if true a Map will be converted to a TabularData with a CompositeData entry, if false the map will be returned directly. + */ +boolean convertMapToTabularData() default true; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/77488769/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java index 9a7c1e0..3146a21 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/DynamicMBeanWrapper.java @@ -18,19 +18,15 @@ */ package org.apache.deltaspike.core.impl.jmx; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; +import org.apache.deltaspike.core.api.config.ConfigResolver; +import org.apache.deltaspike.core.api.jmx.JmxBroadcaster; +import org.apache.deltaspike.core.api.jmx.JmxManaged; +import org.apache.deltaspike.core.api.jmx.JmxParameter; +import org.apache.deltaspike.core.api.jmx.MBean; +import org.apache.deltaspike.core.api.jmx.NotificationInfo; +import org.apache.deltaspike.core.api.provider.BeanManagerProvider; +import org.apache.deltaspike.core.api.provider.BeanProvider; +import org.apache.deltaspike.core.util.ParameterUtil; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; @@ -50,16 +46,27 @@ import javax.management.MBeanParameterInfo; import javax.management.Notification; import javax.management.NotificationBroadcasterSupport; import javax.management.ReflectionException; - -import org.apache.deltaspike.core.api.config.ConfigResolver; -import org.apache.deltaspike.core.api.jmx.JmxBroadcaster; -import org.apache.deltaspike.core.api.jmx.JmxManaged; -import org.apache.deltaspike.core.api.jmx.JmxParameter; -import org.apache.deltaspike.core.api.jmx.MBean; -import org.apache.deltaspike.core.api.jmx.NotificationInfo; -import org.apache.deltaspike.core.api.provider.BeanManagerProvider; -import org.apache.deltaspike.core.api.provider.BeanProvider; -import org.apache.deltaspike.core.util.ParameterUtil; +import javax.management.openmbean.CompositeDataSupport; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.OpenDataException; +import javax.management.openmbean.OpenType; +import javax.management.openmbean.SimpleType; +import javax.managem
deltaspike git commit: ensure dynamic configuration beans have ids
Repository: deltaspike Updated Branches: refs/heads/master b51e9ff0d -> a7e242ce1 ensure dynamic configuration beans have ids Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a7e242ce Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a7e242ce Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a7e242ce Branch: refs/heads/master Commit: a7e242ce143ad2b41902fd9f9ffbf2d53ac4e8de Parents: b51e9ff Author: rmannibucau <rmannibu...@apache.org> Authored: Fri Nov 18 17:35:14 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Fri Nov 18 17:35:14 2016 +0100 -- .../apache/deltaspike/core/impl/config/ConfigurationExtension.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a7e242ce/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java index e1c43d2..deb08e1 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java @@ -197,6 +197,7 @@ public class ConfigurationExtension implements Extension, Deactivatable .beanLifecycle(new ProxyConfigurationLifecycle(proxyType)) .scope(ApplicationScoped.class) .passivationCapable(true) +.id("DeltaSpikeConfiguration#" + proxyType.getName()) .beanClass(proxyType) .create()); }
deltaspike git commit: adding some doc about new configuration features
Repository: deltaspike Updated Branches: refs/heads/master 8e6fa365a -> 277994f97 adding some doc about new configuration features Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/277994f9 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/277994f9 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/277994f9 Branch: refs/heads/master Commit: 277994f97d9067a10469594ec616ed4dc118efd7 Parents: 8e6fa36 Author: rmannibucau <rmannibu...@apache.org> Authored: Wed Nov 9 15:48:19 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Wed Nov 9 15:48:19 2016 +0100 -- .../src/main/asciidoc/configuration.adoc| 77 +++- 1 file changed, 75 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/277994f9/documentation/src/main/asciidoc/configuration.adoc -- diff --git a/documentation/src/main/asciidoc/configuration.adoc b/documentation/src/main/asciidoc/configuration.adoc index 24af969..adedaa3 100644 --- a/documentation/src/main/asciidoc/configuration.adoc +++ b/documentation/src/main/asciidoc/configuration.adoc @@ -61,8 +61,9 @@ The `ConfigResolver` is the central point to access configuration in DeltaSpike. * `ConfigResolver` methods for easy programmatic access to values * `TypedResolver` API for typed configuration values and precise control over resolution * `@ConfigProperty` for injection of configured values into beans + * interface based configuration -All three mechanisms are described in the following sections. +All four mechanisms are described in the following sections. === ConfigResolver methods @@ -354,6 +355,69 @@ public @interface NumberConfig } --- +== Interface based configuration + +The interfaces decorated with `@Configuration` are converted during CDI startup +to Beans matching the interface type. Concretely this interface: + +[source] + +@Configuration +public interface MyConfig { +} + + +Will use accessible using: + +[source] + +@Inject +private MyConfig config; + + +To define a configuration entry in this mode you define an interface method +and decorate it with `@ConfigProperty` exactly as a normal injection: + +[source] + +@Configuration +public interface MyConfig { +@ConfigProperty(name = "my.config") +String url(); +} + + +TIP: this mode also supports primitives like `int`, `boolean`, ... as returned types. + +The methods are no parameter and not returning void methods. + +If all your keys use the same prefix you can configure it on `@Configuration`: + +[source] + +@Configuration(prefix = "client.") +public interface MyConfig { +@ConfigProperty(name = "url") +String url(); + +@ConfigProperty(name = "timeout", defaultValue = "3") +long timeout(); +} + + +Finally, you can also access the caching feature of the `TypedResolver` through `@Configuration`: + +[source] + +@Configuration(cacheFor = 30, cacheUnit = TimeUnit.SECONDS) +public interface MyConfig { +@ConfigProperty(name = "url") +String url(); + +@ConfigProperty(name = "timeout", defaultValue = "3") +long timeout(); +} + == Providing configuration using ConfigSources @@ -436,6 +500,10 @@ DeltaSpike is using internally, if a custom implementation should load the ordinal value from the config-source like the default implementations provided by DeltaSpike do. +Since 1.8.0 you can also decorate a CDI `ConfigSource` with `@Source` and it will +be added to DeltaSpike configuration *once the CDI container is started* (it means +you can't use this source in an `Extension`). + PropertyFileConfig For registering all your own property files of a certain name in your @@ -514,4 +582,9 @@ public class DecryptingConfigFilter implements ConfigFilter { return ""; } -} \ No newline at end of file +} +- + +Since 1.8.0 you can also decorate a CDI `ConfigFilter` with `@Filter` and it will +be added to DeltaSpike configuration *once the CDI container is started* (it means +you can't use this source in an `Extension`).
[4/5] deltaspike git commit: config proxy basic implementation
config proxy basic implementation Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b81d4987 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b81d4987 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b81d4987 Branch: refs/heads/master Commit: b81d4987f218ee2fc37835787c80bd8db7f5c468 Parents: 3f8252e Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Nov 7 12:33:36 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Nov 7 12:33:36 2016 +0100 -- .../core/api/config/Configuration.java | 50 ++ .../spi/config/BaseConfigPropertyProducer.java | 13 +- .../impl/config/ConfigurationExtension.java | 38 - .../config/ProxyConfigurationLifecycle.java | 157 +++ .../core/api/config/injectable/ConfigBean.java | 83 ++ .../InjectableConfigPropertyTest.java | 67 +--- 6 files changed, 383 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b81d4987/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java new file mode 100644 index 000..5c3e33d --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.config; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.concurrent.TimeUnit; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.util.concurrent.TimeUnit.SECONDS; + +/** + * Marker to let DeltaSpike pick this interface and create a proxy getting values + * from the configuration. + * + * The underlying Bean should be normal-scoped. + */ +@Target(TYPE) +@Retention(RUNTIME) +@Documented +public @interface Configuration +{ +/** + * @return the duration while the value is not reloaded. + */ +long cacheFor() default -1; + +/** + * @return the duration unit for {@see cacheFor()}. + */ +TimeUnit cacheUnit() default SECONDS; +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b81d4987/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java index 7cae68d..48517dc 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java @@ -165,6 +165,17 @@ public abstract class BaseConfigPropertyProducer final Class converterType, final String parameterizedBy, final boolean projectStageAware, final boolean evaluate) { +final ConfigResolver.TypedResolver resolver = asResolver( +key, stringDefault, ipCls, converterType, parameterizedBy, projectStageAware, evaluate); +return resolver.getValue(); +} + +public ConfigResolver.TypedResolver asResolver(final String key, final String stringDefault, + final Type ipCls, + final Class converterType, +
[3/5] deltaspike git commit: adding @Source and @Filter to ensure we don't break existing applications
adding @Source and @Filter to ensure we don't break existing applications Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3f8252eb Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3f8252eb Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3f8252eb Branch: refs/heads/master Commit: 3f8252eb797ffba6e54917afdbd720937c0fe3b0 Parents: 0cb288d Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Nov 7 11:59:40 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Nov 7 11:59:40 2016 +0100 -- .../deltaspike/core/api/config/Filter.java | 40 .../deltaspike/core/api/config/Source.java | 40 .../impl/config/ConfigurationExtension.java | 9 +++-- .../core/api/config/injectable/CdiFilter.java | 2 + .../core/api/config/injectable/CdiSource.java | 2 + 5 files changed, 90 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3f8252eb/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Filter.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Filter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Filter.java new file mode 100644 index 000..12ae2d9 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Filter.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.config; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Marker to let DeltaSpike pick automatically the decorated instance + * as a ConfigFilter of current CDI module. + * + * The underlying Bean should be normal-scoped. + */ +@Target({ METHOD, TYPE }) +@Retention(RUNTIME) +@Documented +public @interface Filter +{ +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3f8252eb/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Source.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Source.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Source.java new file mode 100644 index 000..5061fa8 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Source.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.config; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Marker to let DeltaSpike pick automatically the dec
[2/5] deltaspike git commit: cdi source and filter detection
cdi source and filter detection Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0cb288d0 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0cb288d0 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0cb288d0 Branch: refs/heads/master Commit: 0cb288d092ef8131c84dfab33870a65331ecd079 Parents: 6d0c4a2 Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Nov 7 09:35:09 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Nov 7 09:35:09 2016 +0100 -- .../impl/config/ConfigurationExtension.java | 29 + .../core/api/config/injectable/CdiFilter.java | 39 + .../core/api/config/injectable/CdiSource.java | 44 .../InjectableConfigPropertyTest.java | 10 - .../api/config/injectable/SettingsBean.java | 8 5 files changed, 129 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0cb288d0/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java index accabae..63b1867 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java @@ -47,8 +47,10 @@ import org.apache.deltaspike.core.api.config.ConfigProperty; import org.apache.deltaspike.core.api.config.ConfigResolver; import org.apache.deltaspike.core.api.config.PropertyFileConfig; import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.spi.activation.Deactivatable; import org.apache.deltaspike.core.spi.config.BaseConfigPropertyProducer; +import org.apache.deltaspike.core.spi.config.ConfigFilter; import org.apache.deltaspike.core.spi.config.ConfigSource; import org.apache.deltaspike.core.spi.config.ConfigValidator; import org.apache.deltaspike.core.util.ClassDeactivationUtils; @@ -85,6 +87,9 @@ public class ConfigurationExtension implements Extension, Deactivatable private final Set dynamicConfigTypes = new HashSet(); private Bean dynamicProducer; +private final List<Bean> cdiSources = new ArrayList<Bean>(); +private final List<Bean> cdiFilters = new ArrayList<Bean>(); + @SuppressWarnings("UnusedDeclaration") protected void init(@Observes BeforeBeanDiscovery beforeBeanDiscovery) { @@ -120,6 +125,21 @@ public class ConfigurationExtension implements Extension, Deactivatable propertyFileConfigClasses.add(pcsClass); } +public void findSources(@Observes ProcessBean source) +{ +final Class beanClass = source.getBean().getBeanClass(); +if (beanClass != null && beanClass.getName().startsWith("org.apache.deltaspike.core.impl.config.")) // built-in +{ +return; +} +cdiSources.add(source.getBean()); +} + +public void findFilters(@Observes ProcessBean filter) +{ +cdiFilters.add(filter.getBean()); +} + public void findDynamicProducer(@Observes ProcessBean processBean) { dynamicProducer = processBean.getBean(); @@ -178,10 +198,19 @@ public class ConfigurationExtension implements Extension, Deactivatable configSources.addAll(createPropertyConfigSource(propertyFileConfigClass)); } +for (final Bean bean : cdiSources) +{ + configSources.add(BeanProvider.getContextualReference(ConfigSource.class, bean)); +} // finally add all ConfigResolver.addConfigSources(configSources); +for (final Bean bean : cdiFilters) +{ + ConfigResolver.addConfigFilter(BeanProvider.getContextualReference(ConfigFilter.class, bean)); +} + processConfigurationValidation(adv); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0cb288d0/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/CdiFilter.java new file mode 100644 index 000..8ca6031 --
[5/5] deltaspike git commit: adding prefix to @Configuration
adding prefix to @Configuration Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/8e6fa365 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/8e6fa365 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/8e6fa365 Branch: refs/heads/master Commit: 8e6fa365a3e8f52f1262320408457fa95d40cf00 Parents: b81d498 Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Nov 7 12:51:31 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Nov 7 12:51:31 2016 +0100 -- .../core/api/config/Configuration.java | 5 +++ .../config/ProxyConfigurationLifecycle.java | 9 -- .../InjectableConfigPropertyTest.java | 7 + .../config/injectable/PrefixedConfigBean.java | 32 .../META-INF/apache-deltaspike.properties | 2 ++ 5 files changed, 52 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e6fa365/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java index 5c3e33d..d2fa689 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/Configuration.java @@ -47,4 +47,9 @@ public @interface Configuration * @return the duration unit for {@see cacheFor()}. */ TimeUnit cacheUnit() default SECONDS; + +/** + * @return the key prefix to apply to all methods. + */ +String prefix() default ""; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e6fa365/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java index 645e227..13c687e 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ProxyConfigurationLifecycle.java @@ -56,7 +56,8 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle final long cacheFor = configuration.cacheFor(); return Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), api, -new ConfigurationHandler(cacheFor <= 0 ? -1 : configuration.cacheUnit().toMillis(cacheFor))); +new ConfigurationHandler( +cacheFor <= 0 ? -1 : configuration.cacheUnit().toMillis(cacheFor), configuration.prefix())); } @Override @@ -74,10 +75,12 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle private final ConcurrentMap<Method, ConfigResolver.TypedResolver> resolvers = new ConcurrentHashMap<Method, ConfigResolver.TypedResolver>(); private final long cacheMs; +private final String prefix; -private ConfigurationHandler(final long cacheMs) +private ConfigurationHandler(final long cacheMs, final String prefix) { this.cacheMs = cacheMs; +this.prefix = prefix; } @Override @@ -137,7 +140,7 @@ class ProxyConfigurationLifecycle implements ContextualLifecycle } typedResolver = delegate.asResolver( -annotation.name(), annotation.defaultValue(), returnType, +prefix + annotation.name(), annotation.defaultValue(), returnType, annotation.converter(), annotation.parameterizedBy(), annotation.projectStageAware(), annotation.evaluateVariables()); if (cacheMs > 0) http://git-wip-us.apache.org/repos/asf/deltaspike/blob/8e6fa365/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/InjectableConfigPropertyTest.java index bb1e573.
[1/5] deltaspike git commit: support dynamic converted config instances
Repository: deltaspike Updated Branches: refs/heads/master a60cb32e8 -> 8e6fa365a support dynamic converted config instances Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6d0c4a27 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6d0c4a27 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6d0c4a27 Branch: refs/heads/master Commit: 6d0c4a272cbef0e56dd1c60ea4b3f4e4069b8eca Parents: a60cb32 Author: rmannibucau <rmannibu...@apache.org> Authored: Mon Nov 7 09:21:25 2016 +0100 Committer: rmannibucau <rmannibu...@apache.org> Committed: Mon Nov 7 09:21:25 2016 +0100 -- .../core/api/config/ConfigProperty.java | 7 + .../core/api/config/ConfigResolver.java | 21 ++- .../spi/config/BaseConfigPropertyProducer.java | 50 --- .../impl/config/ConfigurationExtension.java | 134 +++ .../config/DefaultConfigPropertyProducer.java | 6 +- .../InjectableConfigPropertyTest.java | 12 ++ .../api/config/injectable/SettingsBean.java | 45 +++ .../META-INF/apache-deltaspike.properties | 4 +- 8 files changed, 256 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6d0c4a27/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java index 260eaa2..a856ad7 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigProperty.java @@ -144,4 +144,11 @@ public @interface ConfigProperty */ @Nonbinding boolean evaluateVariables() default true; + +/** + * Converter for this property. + * @return the converter to use to read this property in the expected type. + */ +@Nonbinding +Class converter() default ConfigResolver.Converter.class; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6d0c4a27/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java index f8f522b..effdd4a 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.api.config; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -760,6 +761,14 @@ public final class ConfigResolver TypedResolver as(Class clazz); /** + * @param type target type, includes List and Map using a Converter + * @param converter The converter for the target type + * @param target type + * @return this builder typed. + */ + TypedResolver as(Type type, Converter converter); + +/** * Sets the type of the configuration entry to the given class, sets the converter to the one given and * returns this builder as a TypedResolver. If a converter is provided for one of the types supported by * default (see {@link #as(Class)} then the provided converter is used instead of the built-in one. @@ -794,7 +803,7 @@ public final class ConfigResolver private String keyResolved; -private Class configEntryType = String.class; +private Type configEntryType = String.class; private boolean withDefault = false; private T defaultValue; @@ -845,6 +854,16 @@ public final class ConfigResolver } @Override +@SuppressWarnings("unchecked") +public TypedResolver as(Type clazz, Converter converter) +{ +configEntryType = clazz; +this.converter = converter; + +return (TypedResolver) this; +} + +@Override public TypedResolver withDefault(T value) { defaultValue = value; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6d0c4a27/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/spi/config/BaseConfigPropertyProducer.java -- diff --git a/del
svn commit: r994600 - /websites/production/deltaspike/content/
Author: rmannibucau Date: Sat Aug 6 13:51:51 2016 New Revision: 994600 Log: Publishing svnmucc operation to deltaspike site by rmannibucau Added: websites/production/deltaspike/content/ - copied from r994599, websites/staging/deltaspike/trunk/content/
svn commit: r1755397 [1/18] - /deltaspike/site/trunk/content/documentation/
Author: rmannibucau Date: Sat Aug 6 13:46:15 2016 New Revision: 1755397 URL: http://svn.apache.org/viewvc?rev=1755397=rev Log: Site checkin for project Apache DeltaSpike Documentation Added: deltaspike/site/trunk/content/documentation/.jpa.adoc.un~ (with props) deltaspike/site/trunk/content/documentation/jpa.adoc~ Modified: deltaspike/site/trunk/content/documentation/bean-validation.html deltaspike/site/trunk/content/documentation/build.html deltaspike/site/trunk/content/documentation/cdiimp.html deltaspike/site/trunk/content/documentation/configuration.html deltaspike/site/trunk/content/documentation/configure.html deltaspike/site/trunk/content/documentation/container-control.html deltaspike/site/trunk/content/documentation/core.html deltaspike/site/trunk/content/documentation/data.html deltaspike/site/trunk/content/documentation/index.html deltaspike/site/trunk/content/documentation/jpa.html deltaspike/site/trunk/content/documentation/jsf.html deltaspike/site/trunk/content/documentation/modules.html deltaspike/site/trunk/content/documentation/overview.html deltaspike/site/trunk/content/documentation/partial-bean.html deltaspike/site/trunk/content/documentation/projectstage.html deltaspike/site/trunk/content/documentation/proxy.html deltaspike/site/trunk/content/documentation/scheduler.html deltaspike/site/trunk/content/documentation/security.html deltaspike/site/trunk/content/documentation/servlet.html deltaspike/site/trunk/content/documentation/snapshots.html deltaspike/site/trunk/content/documentation/spi.html deltaspike/site/trunk/content/documentation/test-control.html Added: deltaspike/site/trunk/content/documentation/.jpa.adoc.un~ URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/.jpa.adoc.un%7E?rev=1755397=auto == Binary file - no diff available. Propchange: deltaspike/site/trunk/content/documentation/.jpa.adoc.un~ -- svn:mime-type = application/octet-stream Modified: deltaspike/site/trunk/content/documentation/bean-validation.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/bean-validation.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/bean-validation.html (original) +++ deltaspike/site/trunk/content/documentation/bean-validation.html Sat Aug 6 13:46:15 2016 @@ -1,410 +1,410 @@ - - - - - - - - - - - - -Bean Validation Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"</a>;> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"</a>;> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"</a>;> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | <a rel="nofollow" href="http://foundation.zurb.com">http://foundation.zurb.com</a> */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comme
svn commit: r1755397 [12/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/partial-bean.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/partial-bean.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/partial-bean.html (original) +++ deltaspike/site/trunk/content/documentation/partial-bean.html Sat Aug 6 13:46:15 2016 @@ -1,430 +1,430 @@ - - - - - - - - - - - - -Partial-Bean Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [3/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/configuration.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/configuration.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/configuration.html (original) +++ deltaspike/site/trunk/content/documentation/configuration.html Sat Aug 6 13:46:15 2016 @@ -1,1061 +1,1061 @@ - - - - - - - - - - - - -DeltaSpike Configuration Mechanism - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay
svn commit: r1755397 [6/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/core.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/core.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/core.html (original) +++ deltaspike/site/trunk/content/documentation/core.html Sat Aug 6 13:46:15 2016 @@ -1,2069 +1,2069 @@ - - - - - - - - - - - - -Core Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay
svn commit: r1755397 [18/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/test-control.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/test-control.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/test-control.html (original) +++ deltaspike/site/trunk/content/documentation/test-control.html Sat Aug 6 13:46:15 2016 @@ -1,1074 +1,1074 @@ - - - - - - - - - - - - -Test-Control Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [5/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/container-control.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/container-control.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/container-control.html (original) +++ deltaspike/site/trunk/content/documentation/container-control.html Sat Aug 6 13:46:15 2016 @@ -1,661 +1,661 @@ - - - - - - - - - - - - -Container Control Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay
svn commit: r1755397 [14/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/scheduler.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/scheduler.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/scheduler.html (original) +++ deltaspike/site/trunk/content/documentation/scheduler.html Sat Aug 6 13:46:15 2016 @@ -1,680 +1,680 @@ - - - - - - - - - - - - -Scheduler Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [15/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/security.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/security.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/security.html (original) +++ deltaspike/site/trunk/content/documentation/security.html Sat Aug 6 13:46:15 2016 @@ -1,829 +1,829 @@ - - - - - - - - - - - - -Security Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [10/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/jsf.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/jsf.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/jsf.html (original) +++ deltaspike/site/trunk/content/documentation/jsf.html Sat Aug 6 13:46:15 2016 @@ -1,3034 +1,3034 @@ - - - - - - - - - - - - -JSF Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay
svn commit: r1755397 [17/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/snapshots.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/snapshots.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/snapshots.html (original) +++ deltaspike/site/trunk/content/documentation/snapshots.html Sat Aug 6 13:46:15 2016 @@ -1,396 +1,396 @@ - - - - - - - - - - - - -Use DeltaSpike Snapshots - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [4/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/configure.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/configure.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/configure.html (original) +++ deltaspike/site/trunk/content/documentation/configure.html Sat Aug 6 13:46:15 2016 @@ -1,546 +1,546 @@ - - - - - - - - - - - - -Configure DeltaSpike in Your Projects - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080}
svn commit: r1755397 [2/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/cdiimp.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/cdiimp.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/cdiimp.html (original) +++ deltaspike/site/trunk/content/documentation/cdiimp.html Sat Aug 6 13:46:15 2016 @@ -1,588 +1,588 @@ - - - - - - - - - - - - -Enable CDI For Your Java Environment - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay
svn commit: r1755397 [7/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/data.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/data.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/data.html (original) +++ deltaspike/site/trunk/content/documentation/data.html Sat Aug 6 13:46:15 2016 @@ -1,2388 +1,2388 @@ - - - - - - - - - - - - -Data Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay
svn commit: r1755397 [13/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/proxy.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/proxy.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/proxy.html (original) +++ deltaspike/site/trunk/content/documentation/proxy.html Sat Aug 6 13:46:15 2016 @@ -1,462 +1,462 @@ - - - - - - - - - - - - -Proxy Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay
svn commit: r1755397 [9/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/jpa.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/jpa.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/jpa.html (original) +++ deltaspike/site/trunk/content/documentation/jpa.html Sat Aug 6 13:46:15 2016 @@ -1,987 +1,989 @@ - - - - - - - - - - - - -JPA Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay
svn commit: r1755397 [8/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/index.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/index.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/index.html (original) +++ deltaspike/site/trunk/content/documentation/index.html Sat Aug 6 13:46:15 2016 @@ -1,327 +1,327 @@ - - - - - - - - - - - - -Documentation - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70} -.CodeRay .variable{color:#036} -.CodeRay .insert{background:#afa} -.CodeRay .delete{background:#faa} -.CodeRay .change{color:#aaf;background:#007} -.CodeRay .head{color:#f8f;background:#505} -.CodeRay .insert .insert{color:#080} -.CodeRay .delete .delete{color:#800} -.CodeRay .change .change{color:#66f} -.CodeRay .head .head{color:#f4f} - -body { -padding-top: 60px; -padding-bottom: 40px; -} - -.toc-like { -border-radius: 6px; -border: 1px solid #ccc; -} - -.toc-like li { -line-height: 30px; -text-indent: 10px; -} - -.toc-like li.custom-toc-header { -font-weight: bold; -background: #666; -
svn commit: r1755397 [16/18] - /deltaspike/site/trunk/content/documentation/
Modified: deltaspike/site/trunk/content/documentation/servlet.html URL: http://svn.apache.org/viewvc/deltaspike/site/trunk/content/documentation/servlet.html?rev=1755397=1755396=1755397=diff == --- deltaspike/site/trunk/content/documentation/servlet.html (original) +++ deltaspike/site/trunk/content/documentation/servlet.html Sat Aug 6 13:46:15 2016 @@ -1,712 +1,712 @@ - - - - - - - - - - - - -Servlet Module - - - - -https://deltaspike.apache.org/resources/css/bootstrap.css; rel="stylesheet"> -https://deltaspike.apache.org/resources/css/bootstrap-responsive.css; rel="stylesheet"> -https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.1.0/css/font-awesome.min.css; rel="stylesheet"> - - - - - -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/stylesheets/jquery.tocify.min.css; rel="stylesheet"> -https://code.jquery.com/jquery-1.11.3.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"> -https://cdnjs.cloudflare.com/ajax/libs/jquery.tocify/1.9.0/javascripts/jquery.tocify.min.js"> - - - -$(function () { -$("#toc").tocify({ -scrollTo: 50, -extendPage: true, -context: "#doc-content", -selectors: "h2,h3,h4,h5" -}); -$(".fallback-toc").hide(); -}); - - - - -/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */ -/*pre.CodeRay {background-color:#f7f7f8;}*/ -.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em} -.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)} -.CodeRay .line-numbers strong{font-weight: normal} -table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none} -table.CodeRay td{vertical-align: top} -table.CodeRay td.line-numbers{text-align:right} -table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)} -table.CodeRay td.code{padding:0 0 0 .5em} -table.CodeRay td.code>pre{padding:0} -.CodeRay .debug{color:#fff !important;background:#80 !important} -.CodeRay .annotation{color:#007} -.CodeRay .attribute-name{color:#80} -.CodeRay .attribute-value{color:#700} -.CodeRay .binary{color:#509} -.CodeRay .comment{color:#998;font-style:italic} -.CodeRay .char{color:#04d} -.CodeRay .char .content{color:#04d} -.CodeRay .char .delimiter{color:#039} -.CodeRay .class{color:#458;font-weight:bold} -.CodeRay .complex{color:#a08} -.CodeRay .constant,.CodeRay .predefined-constant{color:#008080} -.CodeRay .color{color:#099} -.CodeRay .class-variable{color:#369} -.CodeRay .decorator{color:#b0b} -.CodeRay .definition{color:#099} -.CodeRay .delimiter{color:#000} -.CodeRay .doc{color:#970} -.CodeRay .doctype{color:#34b} -.CodeRay .doc-string{color:#d42} -.CodeRay .escape{color:#666} -.CodeRay .entity{color:#800} -.CodeRay .error{color:#808} -.CodeRay .exception{color:inherit} -.CodeRay .filename{color:#099} -.CodeRay .function{color:#900;font-weight:bold} -.CodeRay .global-variable{color:#008080} -.CodeRay .hex{color:#058} -.CodeRay .integer,.CodeRay .float{color:#099} -.CodeRay .include{color:#555} -.CodeRay .inline{color:#00} -.CodeRay .inline .inline{background:#ccc} -.CodeRay .inline .inline .inline{background:#bbb} -.CodeRay .inline .inline-delimiter{color:#d14} -.CodeRay .inline-delimiter{color:#d14} -.CodeRay .important{color:#555;font-weight:bold} -.CodeRay .interpreted{color:#b2b} -.CodeRay .instance-variable{color:#008080} -.CodeRay .label{color:#970} -.CodeRay .local-variable{color:#963} -.CodeRay .octal{color:#40e} -.CodeRay .predefined{color:#369} -.CodeRay .preprocessor{color:#579} -.CodeRay .pseudo-class{color:#555} -.CodeRay .directive{font-weight:bold} -.CodeRay .type{font-weight:bold} -.CodeRay .predefined-type{color:inherit} -.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold} -.CodeRay .key{color:#808} -.CodeRay .key .delimiter{color:#606} -.CodeRay .key .char{color:#80f} -.CodeRay .value{color:#088} -.CodeRay .regexp .delimiter{color:#808} -.CodeRay .regexp .content{color:#808} -.CodeRay .regexp .modifier{color:#808} -.CodeRay .regexp .char{color:#d14} -.CodeRay .regexp .function{color:#404;font-weight:bold} -.CodeRay .string{color:#d20} -.CodeRay .string .string .string{background:#ffd0d0} -.CodeRay .string .content{color:#d14} -.CodeRay .string .char{color:#d14} -.CodeRay .string .delimiter{color:#d14} -.CodeRay .shell{color:#d14} -.CodeRay .shell .delimiter{color:#d14} -.CodeRay .symbol{color:#990073} -.CodeRay .symbol .content{color:#a60} -.CodeRay .symbol .delimiter{color:#630} -.CodeRay .tag{color:#008080} -.CodeRay .tag-special{color:#d70}
deltaspike git commit: trying to make clearer the weld alternative activation
Repository: deltaspike Updated Branches: refs/heads/master 1577c985b -> a1827f70c trying to make clearer the weld alternative activation Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/a1827f70 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/a1827f70 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/a1827f70 Branch: refs/heads/master Commit: a1827f70c9b871f6d15336ce557d23f12996c934 Parents: 1577c98 Author: Romain manni-BucauAuthored: Sat Aug 6 15:41:19 2016 +0200 Committer: Romain manni-Bucau Committed: Sat Aug 6 15:41:19 2016 +0200 -- documentation/src/main/asciidoc/jpa.adoc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/a1827f70/documentation/src/main/asciidoc/jpa.adoc -- diff --git a/documentation/src/main/asciidoc/jpa.adoc b/documentation/src/main/asciidoc/jpa.adoc index a5b3146..32f8ae8 100644 --- a/documentation/src/main/asciidoc/jpa.adoc +++ b/documentation/src/main/asciidoc/jpa.adoc @@ -564,9 +564,11 @@ than the production settings, you can use `org.apache.deltaspike.jpa.impl.transaction.EnvironmentAwareTransactionStrategy` instead. -NOTE: In case of some versions of Weld (or OpenWebBeans in BDA mode), you have +NOTE: In case of some versions of Weld - including several versions of JBoss EAP/Wildfly and Websphere Liberty Profile - +or OpenWebBeans in BDA mode - which is not the default one, you have to configure it as a < > instead of an `alternative` in `beans.xml`. That means you have to add, for example, `globalAlternatives.org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy -=org.apache.deltaspike.jpa.impl.transaction.BeanManagedUserTransactionStrategy` +=org.apache.deltaspike.jpa.impl.transaction.BeanManagedUserTransactionStrategy` or +`globalAlternatives.org.apache.deltaspike.jpa.spi.transaction.TransactionStrategy = org.apache.deltaspike.jpa.impl.transaction.ContainerManagedTransactionStrategy` to `/META-INF/apache-deltaspike.properties`.
deltaspike git commit: DELTASPIKE-1138 ensuring @Futureable works with weld1 - note: we can desire to move the hack in a higher level to benefit to all interceptors
Repository: deltaspike Updated Branches: refs/heads/master 8e23c8205 -> cf140a98c DELTASPIKE-1138 ensuring @Futureable works with weld1 - note: we can desire to move the hack in a higher level to benefit to all interceptors Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cf140a98 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cf140a98 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cf140a98 Branch: refs/heads/master Commit: cf140a98c4496f976e4a4fea9b84d58f795983a7 Parents: 8e23c82 Author: Romain manni-BucauAuthored: Fri Apr 29 16:01:11 2016 +0200 Committer: Romain manni-Bucau Committed: Fri Apr 29 16:01:11 2016 +0200 -- .../impl/future/DefaultFutureableStrategy.java | 113 +++ 1 file changed, 113 insertions(+) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cf140a98/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java index 7a51cc4..70ee7b7 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/DefaultFutureableStrategy.java @@ -31,6 +31,8 @@ import javax.inject.Inject; import javax.interceptor.InvocationContext; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.LinkedList; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -44,6 +46,17 @@ public class DefaultFutureableStrategy implements FutureableStrategy private static final Class COMPLETABLE_FUTURE; private static final Method COMPLETABLE_STAGE_TO_FUTURE; +// only for weld1 +private static final boolean IS_WELD1; +private static final ThreadLocal STACK = new ThreadLocal () +{ +@Override +protected LinkedList initialValue() +{ +return new LinkedList(); +} +}; + static { Class completionStageClass = null; @@ -63,6 +76,23 @@ public class DefaultFutureableStrategy implements FutureableStrategy COMPLETION_STAGE = completionStageClass; COMPLETABLE_FUTURE = completableFutureClass; COMPLETABLE_STAGE_TO_FUTURE = completionStageClassToCompletableFuture; + +{ // workaround for weld -> use a thread local to track the invocations +boolean weld1 = false; +try +{ +final Class impl = Thread.currentThread().getContextClassLoader() +.loadClass("org.jboss.weld.manager.BeanManagerImpl"); +final Package pck = impl.getPackage(); +weld1 = "Weld Implementation".equals(pck.getImplementationTitle()) +&& pck.getSpecificationVersion() != null && pck.getSpecificationVersion().startsWith("1.1."); +} +catch (final Throwable cnfe) +{ +// no-op +} +IS_WELD1 = weld1; +} } @Inject @@ -78,6 +108,33 @@ public class DefaultFutureableStrategy implements FutureableStrategy @Override public Object execute(final InvocationContext ic) throws Exception { +final CallKey invocationKey; +if (IS_WELD1) +{ +invocationKey = new CallKey(ic); +{ // weld1 workaround +final LinkedList stack = STACK.get(); +if (!stack.isEmpty() && stack.getLast().equals(invocationKey)) +{ +try +{ +return ic.proceed(); +} +finally +{ +if (stack.isEmpty()) +{ +STACK.remove(); +} +} +} +} +} +else +{ +invocationKey = null; +} + // validate usage final Class returnType = ic.getMethod().getReturnType(); if (!Future.class.isAssignableFrom(returnType) && @@ -104,6 +161,16 @@ public class DefaultFutureableStrategy implements FutureableStrategy @Override public Object call() throws Exception
deltaspike git commit: DELTASPIKE-1099 @Locked interceptor
Repository: deltaspike Updated Branches: refs/heads/master 4523b5f35 -> 2b630819a DELTASPIKE-1099 @Locked interceptor Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2b630819 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2b630819 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2b630819 Branch: refs/heads/master Commit: 2b630819a6392e52b8ff6c5d306c21aa8cd50e90 Parents: 4523b5f Author: Romain manni-BucauAuthored: Wed Mar 23 10:34:04 2016 +0100 Committer: Romain manni-Bucau Committed: Wed Mar 23 10:34:04 2016 +0100 -- .../apache/deltaspike/core/api/lock/Locked.java | 88 ++ .../core/impl/future/FutureableInterceptor.java | 15 +- .../core/impl/lock/LockedInterceptor.java | 170 +++ .../impl/throttling/ThrottledInterceptor.java | 15 +- .../core/impl/util/AnnotatedMethods.java| 49 ++ .../impl/src/main/resources/META-INF/beans.xml | 1 + .../test/core/impl/lock/LockedTest.java | 161 ++ .../deltaspike/test/core/impl/lock/Service.java | 54 ++ 8 files changed, 527 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2b630819/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java new file mode 100644 index 000..c866327 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lock/Locked.java @@ -0,0 +1,88 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.lock; + +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.util.Nonbinding; +import javax.interceptor.InterceptorBinding; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReadWriteLock; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * The access to the method is protected by a read/write lock. + */ +@InterceptorBinding +@Retention(RUNTIME) +@Target({ TYPE, METHOD }) +public @interface Locked +{ +/** + * @return if the lock is fair. + */ +@Nonbinding +boolean fair() default false; + +/** + * @return the operation used on the lock, default to read but you can use write. + */ +@Nonbinding +Operation operation() default Operation.READ; + +/** + * @return how to retrieve the lock for this method. Default uses a lock per class. + */ +@Nonbinding +Class factory() default LockFactory.class; + +/** + * @return the access timeout for this method. Ignored by default since it is 0. + */ +@Nonbinding +long timeout() default 0L; + +/** + * @return the timeout unit (default ms). + */ +@Nonbinding +TimeUnit timeoutUnit() default TimeUnit.MILLISECONDS; + +enum Operation +{ +READ, WRITE +} + +/** + * Provide a way to switch the ReadWriteLock implementation for @Locked. + */ +interface LockFactory +{ +/** + * @param method the intercepted method. + * @param fair is the lock fair. + * @return a read/write lock used for @Locked implementation. + */ +ReadWriteLock newLock(AnnotatedMethod method, boolean fair); +} +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2b630819/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java -- diff --git
deltaspike git commit: DELTASPIKE-1094 DELTASPIKE-1093 @Throttled and @Futureable
Repository: deltaspike Updated Branches: refs/heads/master a571ac650 -> dbd4fb78e DELTASPIKE-1094 DELTASPIKE-1093 @Throttled and @Futureable Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/dbd4fb78 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/dbd4fb78 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/dbd4fb78 Branch: refs/heads/master Commit: dbd4fb78e1af1acb1e59e3f2de59979b012486b1 Parents: a571ac6 Author: Romain manni-BucauAuthored: Thu Mar 17 12:09:18 2016 +0100 Committer: Romain manni-Bucau Committed: Thu Mar 17 12:09:18 2016 +0100 -- .../deltaspike/core/api/future/Futureable.java | 44 +++ .../core/api/throttling/Throttled.java | 56 .../core/api/throttling/Throttling.java | 73 + .../core/impl/future/FutureableInterceptor.java | 324 +++ .../impl/throttling/ThrottledInterceptor.java | 197 +++ .../impl/src/main/resources/META-INF/beans.xml | 4 + .../test/core/impl/future/FutureableTest.java | 66 .../test/core/impl/future/Service.java | 61 .../test/core/impl/throttling/Service.java | 60 .../test/core/impl/throttling/Service2.java | 69 .../core/impl/throttling/ThrottledTest.java | 277 11 files changed, 1231 insertions(+) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/dbd4fb78/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java new file mode 100644 index 000..2a725c2 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/future/Futureable.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.deltaspike.core.api.future; + +import javax.enterprise.util.Nonbinding; +import javax.interceptor.InterceptorBinding; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Mark the method as execute in a thread pool and not synchronously. + * Note: it should return a CompletionStage or Future. + */ +@InterceptorBinding +@Retention(RUNTIME) +@Target({ TYPE, METHOD }) +public @interface Futureable +{ +/** + * @return pool name, if not existing will use a default one based on processor count. + */ +@Nonbinding +String value() default ""; +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/dbd4fb78/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java new file mode 100644 index 000..4dcc0d2 --- /dev/null +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/throttling/Throttled.java @@ -0,0 +1,56 @@ +/* + * 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
deltaspike git commit: on jdk 7 COMPLETION_STAGE is null
Repository: deltaspike Updated Branches: refs/heads/master dbd4fb78e -> 3de3a3b67 on jdk 7 COMPLETION_STAGE is null Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/3de3a3b6 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/3de3a3b6 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/3de3a3b6 Branch: refs/heads/master Commit: 3de3a3b674187a6cd4b2c9fc80a5641755e9e63b Parents: dbd4fb7 Author: Romain manni-BucauAuthored: Thu Mar 17 12:41:56 2016 +0100 Committer: Romain manni-Bucau Committed: Thu Mar 17 12:41:56 2016 +0100 -- .../apache/deltaspike/core/impl/future/FutureableInterceptor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/3de3a3b6/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java index a1ae35b..4e04734 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java @@ -92,7 +92,8 @@ public class FutureableInterceptor implements Serializable { // validate usage final Class returnType = ic.getMethod().getReturnType(); -if (!COMPLETION_STAGE.isAssignableFrom(returnType) && !Future.class.isAssignableFrom(returnType)) +if (!Future.class.isAssignableFrom(returnType) && +(COMPLETION_STAGE == null || !COMPLETION_STAGE.isAssignableFrom(returnType))) { throw new IllegalArgumentException("Return type should be a CompletableStage or Future"); }
deltaspike git commit: on jdk 7 COMPLETION_STAGE is null - not fast enough idea flush, sorry
Repository: deltaspike Updated Branches: refs/heads/master 3de3a3b67 -> b0a0983b1 on jdk 7 COMPLETION_STAGE is null - not fast enough idea flush, sorry Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b0a0983b Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b0a0983b Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b0a0983b Branch: refs/heads/master Commit: b0a0983b15eb0e6ffc401b8cff467bce7063026d Parents: 3de3a3b Author: Romain manni-BucauAuthored: Thu Mar 17 12:42:34 2016 +0100 Committer: Romain manni-Bucau Committed: Thu Mar 17 12:42:34 2016 +0100 -- .../apache/deltaspike/core/impl/future/FutureableInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b0a0983b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java index 4e04734..a9119ed 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/future/FutureableInterceptor.java @@ -119,7 +119,7 @@ public class FutureableInterceptor implements Serializable try { final Object proceed = ic.proceed(); -final Future future = !COMPLETION_STAGE.isInstance(proceed) ? +final Future future = COMPLETION_STAGE == null || !COMPLETION_STAGE.isInstance(proceed) ? Future.class.cast(proceed) : Future.class.cast(COMPLETABLE_STAGE_TO_FUTURE.invoke(proceed)); /*
deltaspike git commit: missing headers
Repository: deltaspike Updated Branches: refs/heads/master b0a0983b1 -> f30b389ab missing headers Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/f30b389a Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/f30b389a Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/f30b389a Branch: refs/heads/master Commit: f30b389abfffe64d9559b3cebd6c904805e3a020 Parents: b0a0983 Author: Romain manni-BucauAuthored: Thu Mar 17 13:31:39 2016 +0100 Committer: Romain manni-Bucau Committed: Thu Mar 17 13:31:39 2016 +0100 -- .../test/core/impl/future/FutureableTest.java | 18 ++ .../deltaspike/test/core/impl/future/Service.java | 18 ++ .../test/core/impl/throttling/ThrottledTest.java | 18 ++ 3 files changed, 54 insertions(+) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f30b389a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java index afc37e7..53dd1b3 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/FutureableTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.deltaspike.test.core.impl.future; import org.apache.deltaspike.test.util.ArchiveUtils; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f30b389a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java index 2212302..beede68 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/future/Service.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.apache.deltaspike.test.core.impl.future; import org.apache.deltaspike.core.api.future.Futureable; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/f30b389a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java -- diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java index 261a434..16938f7 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/throttling/ThrottledTest.java +++
deltaspike git commit: DELTASPIKE-1008 adding type to @MBean, thanks Falko Molder for the patch
Repository: deltaspike Updated Branches: refs/heads/master 25b5098fc -> 44e5bbb6b DELTASPIKE-1008 adding type to @MBean, thanks Falko Molder for the patch Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/44e5bbb6 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/44e5bbb6 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/44e5bbb6 Branch: refs/heads/master Commit: 44e5bbb6b2a60cb5a1b9876d8465a701155138ce Parents: 25b5098 Author: Romain Manni-BucauAuthored: Fri Oct 23 16:35:52 2015 +0200 Committer: Romain Manni-Bucau Committed: Fri Oct 23 16:35:52 2015 +0200 -- .../apache/deltaspike/core/api/jmx/MBean.java | 8 +++ .../core/impl/jmx/MBeanExtension.java | 26 .../test/core/impl/jmx/CustomType.java | 42 + .../test/core/impl/jmx/CustomTypeTest.java | 66 4 files changed, 131 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/44e5bbb6/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java index 56d8205..b182318 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java @@ -52,6 +52,14 @@ public @interface MBean String name() default ""; /** + * @return the type to use if no objectName was specified. Default is MBeans and can be + * overriden either directly by the value or by a key used to resolve a value using + * {@link org.apache.deltaspike.core.api.config.ConfigResolver}. It is a key if the value is between + * brackets. + */ +String type() default ""; + +/** * @return the direct object name used to export the decorated bean. */ String objectName() default ""; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/44e5bbb6/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java index d07cbce..02366c1 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java @@ -18,8 +18,8 @@ */ package org.apache.deltaspike.core.impl.jmx; -import org.apache.deltaspike.core.api.config.base.CoreBaseConfig; import org.apache.deltaspike.core.api.config.ConfigResolver; +import org.apache.deltaspike.core.api.config.base.CoreBaseConfig; import org.apache.deltaspike.core.api.jmx.JmxBroadcaster; import org.apache.deltaspike.core.api.jmx.MBean; import org.apache.deltaspike.core.spi.activation.Deactivatable; @@ -99,21 +99,15 @@ public class MBeanExtension implements Extension, Deactivatable if (objectNameValue.isEmpty()) { String name = mBeanAnnotation.name(); - if (name.isEmpty()) { name = clazz.getName(); } -String category = mBeanAnnotation.category().trim(); - -if (category.startsWith("{") && category.endsWith("}")) -{ -category = ConfigResolver.getPropertyValue( -category.substring(1, category.length() - 1), "org.apache.deltaspike"); -} +final String type = getConfigurableAttribute(mBeanAnnotation.type(), "MBeans"); +final String category = getConfigurableAttribute(mBeanAnnotation.category(), "org.apache.deltaspike"); -objectNameValue = category + ":type=MBeans,name=" + name; +objectNameValue = category + ":type=" + type + ",name=" + name; } final ObjectName objectName = new ObjectName(objectNameValue); @@ -131,7 +125,7 @@ public class MBeanExtension implements Extension, Deactivatable objectNames.add(objectName); wrappers.put(clazz, mbean); -LOGGER.info("Registered MBean " + objectName.getCanonicalName()); +LOGGER.info("Registered MBean " + objectName); // don't use canonical name cause it can reorder properties } private Annotation[] qualifiers(final AnnotatedType annotatedBeanClass, final BeanManager bm) @@ -163,4
deltaspike git commit: DELTASPIKE-1008 adding properties() to @MBean
Repository: deltaspike Updated Branches: refs/heads/master 44e5bbb6b -> b3570077a DELTASPIKE-1008 adding properties() to @MBean Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/b3570077 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/b3570077 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/b3570077 Branch: refs/heads/master Commit: b3570077ab5dc0c7568051bee825fa8ccdc1995f Parents: 44e5bbb Author: Romain Manni-BucauAuthored: Fri Oct 23 16:50:35 2015 +0200 Committer: Romain Manni-Bucau Committed: Fri Oct 23 16:50:35 2015 +0200 -- .../apache/deltaspike/core/api/jmx/MBean.java | 6 ++ .../core/impl/jmx/MBeanExtension.java | 42 +++--- .../test/core/impl/jmx/CustomProperties.java| 42 ++ .../test/core/impl/jmx/CustomProperties2.java | 42 ++ .../core/impl/jmx/CustomPropertiesTest.java | 60 5 files changed, 184 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b3570077/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java -- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java index b182318..27b23d4 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/jmx/MBean.java @@ -52,6 +52,12 @@ public @interface MBean String name() default ""; /** + * @return the properties part of the objectName if no objectName was specified. + * If name and type are specified this segment is concatenated after. + */ +String properties() default ""; + +/** * @return the type to use if no objectName was specified. Default is MBeans and can be * overriden either directly by the value or by a key used to resolve a value using * {@link org.apache.deltaspike.core.api.config.ConfigResolver}. It is a key if the value is between http://git-wip-us.apache.org/repos/asf/deltaspike/blob/b3570077/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java -- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java index 02366c1..93f8d9f 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/jmx/MBeanExtension.java @@ -47,6 +47,8 @@ import java.util.logging.Logger; public class MBeanExtension implements Extension, Deactivatable { private static final Logger LOGGER = Logger.getLogger(MBeanExtension.class.getName()); +private static final String DEFAULT_TYPE = "MBeans"; +private static final String DEFAULT_CATEGORY = "org.apache.deltaspike"; private final Map wrappers = new ConcurrentHashMap (); @@ -98,16 +100,40 @@ public class MBeanExtension implements Extension, Deactivatable String objectNameValue = mBeanAnnotation.objectName(); if (objectNameValue.isEmpty()) { -String name = mBeanAnnotation.name(); -if (name.isEmpty()) +final String type = getConfigurableAttribute(mBeanAnnotation.type(), DEFAULT_TYPE); +final String category = getConfigurableAttribute(mBeanAnnotation.category(), DEFAULT_CATEGORY); +final String properties = getConfigurableAttribute(mBeanAnnotation.properties(), ""); +final String name = mBeanAnnotation.name(); + +final StringBuilder builder = new StringBuilder(category).append(':'); +if (!properties.contains("type=")) { -name = clazz.getName(); +builder.append("type=").append(type); } - -final String type = getConfigurableAttribute(mBeanAnnotation.type(), "MBeans"); -final String category = getConfigurableAttribute(mBeanAnnotation.category(), "org.apache.deltaspike"); - -objectNameValue = category + ":type=" + type + ",name=" + name; +else if (!DEFAULT_TYPE.equals(type)) +{ +LOGGER.warning("type() ignored on " + clazz + " since properties contains it."); +} +if (!properties.contains("name=")) +
git commit: DELTASPIKE-537 cleanup (header + typo in names)
Repository: deltaspike Updated Branches: refs/heads/master a740dc595 - 1f576a05d DELTASPIKE-537 cleanup (header + typo in names) Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/1f576a05 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/1f576a05 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/1f576a05 Branch: refs/heads/master Commit: 1f576a05d0d4e375ce5c2dff28bd64f13774d5d2 Parents: a740dc5 Author: Romain Manni-Bucau rmannibu...@gmail.com Authored: Sun Mar 9 08:39:04 2014 +0100 Committer: Romain Manni-Bucau rmannibu...@gmail.com Committed: Sun Mar 9 08:39:04 2014 +0100 -- .../DeltaspikeServerUtilAppender.java | 39 .../arquillian/DeltaspikeTestUtilExtension.java | 31 jboss.arquillian.core.spi.LoadableExtension | 20 +- 3 files changed, 19 insertions(+), 71 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1f576a05/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeServerUtilAppender.java -- diff --git a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeServerUtilAppender.java b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeServerUtilAppender.java deleted file mode 100644 index 52d79a8..000 --- a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeServerUtilAppender.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.deltaspike.test.arquillian; - -import org.apache.deltaspike.test.category.DeltaSpikeTest; -import org.apache.deltaspike.test.utils.Serializer; -import org.jboss.arquillian.container.test.spi.client.deployment.CachedAuxilliaryArchiveAppender; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; - -public class DeltaspikeServerUtilAppender extends CachedAuxilliaryArchiveAppender -{ -@Override -protected Archive? buildArchive() -{ -return ShrinkWrap.create(JavaArchive.class, test-utils.jar) -.addPackage(Serializer.class.getPackage()) -.addPackage(DeltaSpikeTest.class.getPackage()) -.addAsManifestResource(EmptyAsset.INSTANCE, beans.xml); -} -} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/1f576a05/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeTestUtilExtension.java -- diff --git a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeTestUtilExtension.java b/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeTestUtilExtension.java deleted file mode 100644 index 2b5bbae..000 --- a/deltaspike/test-utils/src/main/java/org/apache/deltaspike/test/arquillian/DeltaspikeTestUtilExtension.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.deltaspike.test.arquillian; -
git commit: DELTASPIKE-518 DS Data should support Wrapped JPA APIs. Base don JL Monteiro patch, Thanks :)
Updated Branches: refs/heads/master 1018aee5d - bd6796897 DELTASPIKE-518 DS Data should support Wrapped JPA APIs. Base don JL Monteiro patch, Thanks :) Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bd679689 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bd679689 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bd679689 Branch: refs/heads/master Commit: bd6796897ec8e7602a8dcdabe143077bc2ee156c Parents: 1018aee Author: Romain Manni-Bucau rmannibu...@apache.org Authored: Thu Feb 6 19:34:33 2014 +0100 Committer: Romain Manni-Bucau rmannibu...@apache.org Committed: Thu Feb 6 19:34:33 2014 +0100 -- deltaspike/modules/data/impl/pom.xml| 6 ++ .../impl/builder/AnnotatedQueryBuilder.java | 2 +- .../postprocessor/CountQueryPostProcessor.java | 2 +- .../jpa/EclipseLinkEjbQueryStringExtractor.java | 4 +- .../util/jpa/HibernateQueryStringExtractor.java | 4 +- .../util/jpa/OpenJpaQueryStringExtractor.java | 5 +- .../impl/util/jpa/QueryStringExtractor.java | 4 +- .../util/jpa/QueryStringExtractorFactory.java | 40 +++- .../jpa/QueryStringExtractorFactoryTest.java| 65 9 files changed, 101 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/pom.xml -- diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml index 7b262fb..3661270 100755 --- a/deltaspike/modules/data/impl/pom.xml +++ b/deltaspike/modules/data/impl/pom.xml @@ -121,6 +121,12 @@ artifactIdshrinkwrap-resolver-impl-maven/artifactId scopetest/scope /dependency +dependency +groupIdorg.apache.openjpa/groupId +artifactIdopenjpa/artifactId +version2.3.0/version +scopetest/scope +/dependency /dependencies http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java -- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java index b201af4..b44d369 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/AnnotatedQueryBuilder.java @@ -63,7 +63,7 @@ public class AnnotatedQueryBuilder extends QueryBuilder else { javax.persistence.Query namedQuery = entityManager.createNamedQuery(query.named()); -String named = factory.select(namedQuery).extractFrom(namedQuery); +String named = factory.extract(namedQuery); String jpqlQuery = context.applyQueryStringPostProcessors(named); result = params.applyTo(entityManager.createQuery(jpqlQuery)); } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java -- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java index 6659776..c34e269 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/postprocessor/CountQueryPostProcessor.java @@ -55,7 +55,7 @@ public class CountQueryPostProcessor implements JpaQueryPostProcessor { return context.getQueryString(); } -return factory.select(query).extractFrom(query); +return factory.extract(query); } private static class QueryExtraction http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bd679689/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/EclipseLinkEjbQueryStringExtractor.java -- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/util/jpa/EclipseLinkEjbQueryStringExtractor.java