You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/02/12 23:40:08 UTC
svn commit: r1567781 [1/5] - in /commons/proper/weaver/trunk:
ant/lib/src/main/java/org/apache/commons/weaver/ant/ dist/ dist/src/assembly/
example/src/main/java/org/apache/commons/weaver/privilizer/example/
example/src/test/java/org/apache/commons/wea...
Author: sebb
Date: Wed Feb 12 22:40:06 2014
New Revision: 1567781
URL: http://svn.apache.org/r1567781
Log:
Fix up eol-style etc
Modified:
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java (contents, props changed)
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/CleanTask.java (props changed)
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java (contents, props changed)
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java (contents, props changed)
commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/package-info.java (props changed)
commons/proper/weaver/trunk/dist/pom.xml (props changed)
commons/proper/weaver/trunk/dist/src/assembly/bin.xml (props changed)
commons/proper/weaver/trunk/dist/src/assembly/src.xml (props changed)
commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java (contents, props changed)
commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java (contents, props changed)
commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java (contents, props changed)
commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java (contents, props changed)
commons/proper/weaver/trunk/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java (props changed)
commons/proper/weaver/trunk/maven-plugin/src/main/java/org/apache/commons/weaver/maven/package-info.java (props changed)
commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/example/pom.xml (props changed)
commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/pom.xml (props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml (props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/NormalizerWeaver.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Utils.java (contents, props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/package-info.java (props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/resources/META-INF/services/org.apache.commons.weaver.spi.Weaver (props changed)
commons/proper/weaver/trunk/modules/normalizer/weaver/src/test/java/org/apache/commons/weaver/normalizer/UtilsTest.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/Privilizing.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/package-info.java (props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Field.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/FieldAccess.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Policy.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilized.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java (props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerWeaver.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java (contents, props changed)
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/package-info.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/CleanProcessor.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/Inflater.java (contents, props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/LocalWeaveEnvironment.java (contents, props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Scanner.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/package-info.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/package-info.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/spi/Cleaner.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/spi/package-info.java (props changed)
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/utils/package-info.java (props changed)
commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/test/CleanProcessorTest.java (props changed)
commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/test/beans/AbstractTestBean.java (contents, props changed)
commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/test/beans/TestBeanInterface.java (contents, props changed)
commons/proper/weaver/trunk/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java (props changed)
commons/proper/weaver/trunk/src/changes/changes.xml (props changed)
commons/proper/weaver/trunk/src/site/xdoc/download_weaver.xml (contents, props changed)
Modified: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java (original)
+++ commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java Wed Feb 12 22:40:06 2014
@@ -1,70 +1,70 @@
-/*
- * 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.commons.weaver.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Reference;
-
-/**
- * Abstract weaver Ant task. Manages settings for filesystem-based weaving.
- */
-public abstract class AbstractWeaverTask extends Task {
- private WeaverSettings settings;
-
- /**
- * Create a new {@link AbstractWeaverTask} instance.
- * @param project owner
- */
- protected AbstractWeaverTask(Project project) {
- super();
- setProject(project);
- }
-
- /**
- * Add a nested {@link WeaverSettings}.
- * @param settings to add
- */
- public void add(WeaverSettings settings) {
- if (this.settings != null) {
- throw new BuildException("settings already specified");
- }
- this.settings = settings;
- }
-
- /**
- * Get the {@link WeaverSettings} in use.
- * @return {@link WeaverSettings}
- */
- public WeaverSettings getSettings() {
- return settings;
- }
-
- /**
- * Set a project reference to a {@link WeaverSettings} object.
- * @param refid key
- */
- public void setSettingsRef(String refid) {
- final WeaverSettings settings = new WeaverSettings(getProject());
- settings.setRefid(new Reference(getProject(), refid));
- add(settings);
- }
-
+/*
+ * 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.commons.weaver.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Reference;
+
+/**
+ * Abstract weaver Ant task. Manages settings for filesystem-based weaving.
+ */
+public abstract class AbstractWeaverTask extends Task {
+ private WeaverSettings settings;
+
+ /**
+ * Create a new {@link AbstractWeaverTask} instance.
+ * @param project owner
+ */
+ protected AbstractWeaverTask(Project project) {
+ super();
+ setProject(project);
+ }
+
+ /**
+ * Add a nested {@link WeaverSettings}.
+ * @param settings to add
+ */
+ public void add(WeaverSettings settings) {
+ if (this.settings != null) {
+ throw new BuildException("settings already specified");
+ }
+ this.settings = settings;
+ }
+
+ /**
+ * Get the {@link WeaverSettings} in use.
+ * @return {@link WeaverSettings}
+ */
+ public WeaverSettings getSettings() {
+ return settings;
+ }
+
+ /**
+ * Set a project reference to a {@link WeaverSettings} object.
+ * @param refid key
+ */
+ public void setSettingsRef(String refid) {
+ final WeaverSettings settings = new WeaverSettings(getProject());
+ settings.setRefid(new Reference(getProject(), refid));
+ add(settings);
+ }
+
}
\ No newline at end of file
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/CleanTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java (original)
+++ commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java Wed Feb 12 22:40:06 2014
@@ -1,75 +1,75 @@
-/*
- * 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.commons.weaver.ant;
-
-import java.util.Properties;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.DynamicElement;
-
-/**
- * <p>Structure to allow inline specification of properties.</p>
- * <p>Example:
- * {pre}<foo>foo-value</foo>
- * <bar>bar-value</bar>
- * <baz>baz
- * -nextline-value</baz>
- * {/pre}
- * </p>
- */
-public class InlineProperties implements DynamicElement {
- /**
- * Represents a single inline property.
- */
- public final class InlineProperty {
- private final String name;
-
- private InlineProperty(String name) {
- this.name = name;
- }
-
- /**
- * Add text to this property.
- * @param text to add
- */
- public void addText(String text) {
- final String value;
- if (properties.containsKey(name)) {
- value = StringUtils.join(properties.getProperty(name), text);
- } else {
- value = text;
- }
- properties.setProperty(name, value);
- }
- }
-
- /**
- * {@link Properties} object maintained by the {@link InlineProperties}.
- */
- final Properties properties = new Properties();
-
- /**
- * Handle the specified nested element.
- * @param name property name
- * @return {@link InlineProperty}
- */
- public InlineProperty createDynamicElement(String name) {
- return new InlineProperty(name);
- }
+/*
+ * 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.commons.weaver.ant;
+
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tools.ant.DynamicElement;
+
+/**
+ * <p>Structure to allow inline specification of properties.</p>
+ * <p>Example:
+ * {pre}<foo>foo-value</foo>
+ * <bar>bar-value</bar>
+ * <baz>baz
+ * -nextline-value</baz>
+ * {/pre}
+ * </p>
+ */
+public class InlineProperties implements DynamicElement {
+ /**
+ * Represents a single inline property.
+ */
+ public final class InlineProperty {
+ private final String name;
+
+ private InlineProperty(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Add text to this property.
+ * @param text to add
+ */
+ public void addText(String text) {
+ final String value;
+ if (properties.containsKey(name)) {
+ value = StringUtils.join(properties.getProperty(name), text);
+ } else {
+ value = text;
+ }
+ properties.setProperty(name, value);
+ }
+ }
+
+ /**
+ * {@link Properties} object maintained by the {@link InlineProperties}.
+ */
+ final Properties properties = new Properties();
+
+ /**
+ * Handle the specified nested element.
+ * @param name property name
+ * @return {@link InlineProperty}
+ */
+ public InlineProperty createDynamicElement(String name) {
+ return new InlineProperty(name);
+ }
}
\ No newline at end of file
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/InlineProperties.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java (original)
+++ commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java Wed Feb 12 22:40:06 2014
@@ -1,217 +1,217 @@
-/*
- * 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.commons.weaver.ant;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.DataType;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PropertySet;
-import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.types.PropertySet.BuiltinPropertySetName;
-
-/**
- * Standalone weaver settings datatype. Handles:
- * <ul>
- * <li>{@code target} attribute - {@link File}</li>
- * <li>{@code classpath} attribute - {@link Path} (incompatible with {@code classpathref})</li>
- * <li>{@code classpathref} attribute - {@link String} (incompatible with {@code classpath})</li>
- * <li>nested {@code propertyset} - {@link PropertySet}</li>
- * <li>nested {@code properties} - {@link InlineProperties}</li>
- * </ul>
- * {@code propertyset} and {@code properties} are merged, with the latter taking precedence.
- */
-public class WeaverSettings extends DataType {
- private File target;
- private Path classpath;
- private String classpathref;
- private PropertySet propertySet;
- private InlineProperties inlineProperties;
-
- /**
- * Create a new {@link WeaverSettings} object.
- * @param project owner
- */
- public WeaverSettings(Project project) {
- super();
- setProject(project);
- }
-
- /**
- * Get the {@code target} directory.
- * @return {@link File}
- */
- public File getTarget() {
- if (isReference()) {
- return getRef().getTarget();
- }
- return target;
- }
-
- /**
- * Set the {@code target} directory.
- * @param target {@link File}
- */
- public void setTarget(File target) {
- if (isReference()) {
- throw tooManyAttributes();
- }
- this.target = target;
- }
-
- /**
- * Get the {@code classpathref}.
- * @return {@link String}
- */
- public String getClasspathref() {
- if (isReference()) {
- return getRef().getClasspathref();
- }
- return classpathref;
- }
-
- /**
- * Set the {@code classpathref}.
- * @param classpathref {@link String}
- */
- public void setClasspathRef(String classpathref) {
- if (isReference()) {
- throw tooManyAttributes();
- }
- this.classpathref = classpathref;
- }
-
- /**
- * Return the effective classpath (system classpath + configured classpath) as a {@link List} of {@link String}
- * filesystem paths.
- * @return List<String>
- */
- public List<String> getClasspathEntries() {
- final Path p = new Path(getProject());
- final Path cp = getClasspath();
- if (cp != null) {
- p.add(cp);
- }
- p.add(Path.systemClasspath);
-
- return Arrays.asList(p.list());
- }
-
- /**
- * Get the {@code classpath}.
- * @return {@link Path}
- */
- public Path getClasspath() {
- if (isReference()) {
- return getRef().getClasspath();
- }
- if (classpath == null) {
- if (getClasspathref() != null) {
- Path ref = new Path(getProject());
- ref.setRefid(new Reference(getProject(), getClasspathref()));
- return ref;
- }
- } else if (StringUtils.isNotBlank(getClasspathref())) {
- throw new BuildException("Only one of classpathref|classpath is permitted.");
- }
- return classpath;
- }
-
- /**
- * Set the {@code classpath}.
- * @param classpath {@link Path}
- */
- public void setClasspath(Path classpath) {
- if (isReference()) {
- throw tooManyAttributes();
- }
- if (this.classpath != null) {
- throw new BuildException("classpath already set");
- }
- this.classpath = classpath;
- }
-
- /**
- * Create the nested {@code properties}.
- * @return {@link InlineProperties}
- */
- public InlineProperties createProperties() {
- if (isReference()) {
- throw noChildrenAllowed();
- }
- if (inlineProperties != null) {
- throw new BuildException("properties already specified");
- }
- inlineProperties = new InlineProperties();
- return inlineProperties;
- }
-
- /**
- * Create a nested {@code propertyset}.
- * @return {@link PropertySet}
- */
- public PropertySet createPropertySet() {
- if (isReference()) {
- throw noChildrenAllowed();
- }
- if (propertySet != null) {
- throw new BuildException("propertyset already specified");
- }
- propertySet = new PropertySet();
- propertySet.setProject(getProject());
- return propertySet;
- }
-
- /**
- * Merge nested {@code propertyset} and {@code properties}; latter takes precedence.
- * @return Properties
- */
- public Properties getProperties() {
- if (isReference()) {
- return getRef().getProperties();
- }
- if (propertySet == null && inlineProperties == null) {
- createPropertySet().appendBuiltin(
- (BuiltinPropertySetName) EnumeratedAttribute.getInstance(BuiltinPropertySetName.class, "all"));
- }
- final Properties result = new Properties();
- if (propertySet != null) {
- result.putAll(propertySet.getProperties());
- }
- if (inlineProperties != null) {
- for (Map.Entry<Object, Object> e : inlineProperties.properties.entrySet()) {
- result.put(e.getKey(), StringUtils.trim((String) e.getValue()));
- }
- }
- return result;
- }
-
- private WeaverSettings getRef() {
- return (WeaverSettings) getCheckedRef(WeaverSettings.class, "settings");
- }
-
+/*
+ * 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.commons.weaver.ant;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.PropertySet;
+import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.types.PropertySet.BuiltinPropertySetName;
+
+/**
+ * Standalone weaver settings datatype. Handles:
+ * <ul>
+ * <li>{@code target} attribute - {@link File}</li>
+ * <li>{@code classpath} attribute - {@link Path} (incompatible with {@code classpathref})</li>
+ * <li>{@code classpathref} attribute - {@link String} (incompatible with {@code classpath})</li>
+ * <li>nested {@code propertyset} - {@link PropertySet}</li>
+ * <li>nested {@code properties} - {@link InlineProperties}</li>
+ * </ul>
+ * {@code propertyset} and {@code properties} are merged, with the latter taking precedence.
+ */
+public class WeaverSettings extends DataType {
+ private File target;
+ private Path classpath;
+ private String classpathref;
+ private PropertySet propertySet;
+ private InlineProperties inlineProperties;
+
+ /**
+ * Create a new {@link WeaverSettings} object.
+ * @param project owner
+ */
+ public WeaverSettings(Project project) {
+ super();
+ setProject(project);
+ }
+
+ /**
+ * Get the {@code target} directory.
+ * @return {@link File}
+ */
+ public File getTarget() {
+ if (isReference()) {
+ return getRef().getTarget();
+ }
+ return target;
+ }
+
+ /**
+ * Set the {@code target} directory.
+ * @param target {@link File}
+ */
+ public void setTarget(File target) {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
+ this.target = target;
+ }
+
+ /**
+ * Get the {@code classpathref}.
+ * @return {@link String}
+ */
+ public String getClasspathref() {
+ if (isReference()) {
+ return getRef().getClasspathref();
+ }
+ return classpathref;
+ }
+
+ /**
+ * Set the {@code classpathref}.
+ * @param classpathref {@link String}
+ */
+ public void setClasspathRef(String classpathref) {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
+ this.classpathref = classpathref;
+ }
+
+ /**
+ * Return the effective classpath (system classpath + configured classpath) as a {@link List} of {@link String}
+ * filesystem paths.
+ * @return List<String>
+ */
+ public List<String> getClasspathEntries() {
+ final Path p = new Path(getProject());
+ final Path cp = getClasspath();
+ if (cp != null) {
+ p.add(cp);
+ }
+ p.add(Path.systemClasspath);
+
+ return Arrays.asList(p.list());
+ }
+
+ /**
+ * Get the {@code classpath}.
+ * @return {@link Path}
+ */
+ public Path getClasspath() {
+ if (isReference()) {
+ return getRef().getClasspath();
+ }
+ if (classpath == null) {
+ if (getClasspathref() != null) {
+ Path ref = new Path(getProject());
+ ref.setRefid(new Reference(getProject(), getClasspathref()));
+ return ref;
+ }
+ } else if (StringUtils.isNotBlank(getClasspathref())) {
+ throw new BuildException("Only one of classpathref|classpath is permitted.");
+ }
+ return classpath;
+ }
+
+ /**
+ * Set the {@code classpath}.
+ * @param classpath {@link Path}
+ */
+ public void setClasspath(Path classpath) {
+ if (isReference()) {
+ throw tooManyAttributes();
+ }
+ if (this.classpath != null) {
+ throw new BuildException("classpath already set");
+ }
+ this.classpath = classpath;
+ }
+
+ /**
+ * Create the nested {@code properties}.
+ * @return {@link InlineProperties}
+ */
+ public InlineProperties createProperties() {
+ if (isReference()) {
+ throw noChildrenAllowed();
+ }
+ if (inlineProperties != null) {
+ throw new BuildException("properties already specified");
+ }
+ inlineProperties = new InlineProperties();
+ return inlineProperties;
+ }
+
+ /**
+ * Create a nested {@code propertyset}.
+ * @return {@link PropertySet}
+ */
+ public PropertySet createPropertySet() {
+ if (isReference()) {
+ throw noChildrenAllowed();
+ }
+ if (propertySet != null) {
+ throw new BuildException("propertyset already specified");
+ }
+ propertySet = new PropertySet();
+ propertySet.setProject(getProject());
+ return propertySet;
+ }
+
+ /**
+ * Merge nested {@code propertyset} and {@code properties}; latter takes precedence.
+ * @return Properties
+ */
+ public Properties getProperties() {
+ if (isReference()) {
+ return getRef().getProperties();
+ }
+ if (propertySet == null && inlineProperties == null) {
+ createPropertySet().appendBuiltin(
+ (BuiltinPropertySetName) EnumeratedAttribute.getInstance(BuiltinPropertySetName.class, "all"));
+ }
+ final Properties result = new Properties();
+ if (propertySet != null) {
+ result.putAll(propertySet.getProperties());
+ }
+ if (inlineProperties != null) {
+ for (Map.Entry<Object, Object> e : inlineProperties.properties.entrySet()) {
+ result.put(e.getKey(), StringUtils.trim((String) e.getValue()));
+ }
+ }
+ return result;
+ }
+
+ private WeaverSettings getRef() {
+ return (WeaverSettings) getCheckedRef(WeaverSettings.class, "settings");
+ }
+
}
\ No newline at end of file
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/ant/lib/src/main/java/org/apache/commons/weaver/ant/package-info.java
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/dist/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/dist/pom.xml
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/dist/src/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/dist/src/assembly/bin.xml
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/dist/src/assembly/src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/dist/src/assembly/src.xml
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java (original)
+++ commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java Wed Feb 12 22:40:06 2014
@@ -1,39 +1,39 @@
-/*
- * Copyright the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.weaver.privilizer.example;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-final class Setup {
- private Setup() {
- }
-
- /**
- * This simply allows us to to set up test classes by doing
- * privileged things without granting privileges to the test
- * code itself and thus making it impossible to test the effects
- * of privilization.
- */
- public static void setProperty(final String name, final String value) {
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- public Void run() {
- System.setProperty(name, value);
- return null;
- }
- });
- }
-}
+/*
+ * Copyright the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.weaver.privilizer.example;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+final class Setup {
+ private Setup() {
+ }
+
+ /**
+ * This simply allows us to to set up test classes by doing
+ * privileged things without granting privileges to the test
+ * code itself and thus making it impossible to test the effects
+ * of privilization.
+ */
+ public static void setProperty(final String name, final String value) {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ public Void run() {
+ System.setProperty(name, value);
+ return null;
+ }
+ });
+ }
+}
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Setup.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java (original)
+++ commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java Wed Feb 12 22:40:06 2014
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.commons.weaver.privilizer.example;
-
-import org.apache.commons.weaver.privilizer.Privilizing;
-import org.apache.commons.weaver.privilizer.Privilizing.CallTo;
-
-@Privilizing({ @CallTo(Utils.class), @CallTo(value = Utils.More.class, methods = "getProperty") })
-public class UsingBlueprints {
-
- public String utilsReadPublicConstant() {
- return Utils.readPublicConstant();
- }
-
- public int utilsReadPrivateField() {
- return Utils.readPrivateField();
- }
-
- public String utilsGetProperty() {
- return Utils.getProperty();
- }
-
- public String utilsGetProperty(int i, String key) {
- return Utils.getProperty(i, key);
- }
-
- public String utilsGetProperty(String key) {
- return Utils.getProperty(key);
- }
-
- public String moreGetProperty() {
- return Utils.More.getProperty();
- }
-
- public String moreGetTopStackElementClassName() {
- return Utils.More.getTopStackElementClassName();
- }
-}
+/*
+ * 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.commons.weaver.privilizer.example;
+
+import org.apache.commons.weaver.privilizer.Privilizing;
+import org.apache.commons.weaver.privilizer.Privilizing.CallTo;
+
+@Privilizing({ @CallTo(Utils.class), @CallTo(value = Utils.More.class, methods = "getProperty") })
+public class UsingBlueprints {
+
+ public String utilsReadPublicConstant() {
+ return Utils.readPublicConstant();
+ }
+
+ public int utilsReadPrivateField() {
+ return Utils.readPrivateField();
+ }
+
+ public String utilsGetProperty() {
+ return Utils.getProperty();
+ }
+
+ public String utilsGetProperty(int i, String key) {
+ return Utils.getProperty(i, key);
+ }
+
+ public String utilsGetProperty(String key) {
+ return Utils.getProperty(key);
+ }
+
+ public String moreGetProperty() {
+ return Utils.More.getProperty();
+ }
+
+ public String moreGetTopStackElementClassName() {
+ return Utils.More.getTopStackElementClassName();
+ }
+}
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/UsingBlueprints.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java (original)
+++ commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java Wed Feb 12 22:40:06 2014
@@ -1,68 +1,68 @@
-/*
- * 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.commons.weaver.privilizer.example;
-
-public final class Utils {
- public static final class More {
- private More() {
- }
-
- public static String getProperty() {
- return Utils.getProperty("bar");
- }
-
- public static String getTopStackElementClassName() {
- return Thread.currentThread().getStackTrace()[1].getClassName();
- }
- }
-
- private Utils() {
- }
-
- public static final String FOO = "foo".intern();
-
- public static String readPublicConstant() {
- return FOO;
- }
-
- public static String getProperty() {
- return getProperty("foo");
- }
-
- public static String getProperty(int i, String key) {
- if (i <= 0) {
- return getProperty(key);
- }
- int counter = i;
- return getProperty(--counter, key);
- }
-
- public static String getProperty(String key) {
- return System.getProperty(key);
- }
-
- private static Integer n;
- static {
- n = Integer.valueOf(999);
- }
-
- public static int readPrivateField() {
- return n;
- }
-}
+/*
+ * 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.commons.weaver.privilizer.example;
+
+public final class Utils {
+ public static final class More {
+ private More() {
+ }
+
+ public static String getProperty() {
+ return Utils.getProperty("bar");
+ }
+
+ public static String getTopStackElementClassName() {
+ return Thread.currentThread().getStackTrace()[1].getClassName();
+ }
+ }
+
+ private Utils() {
+ }
+
+ public static final String FOO = "foo".intern();
+
+ public static String readPublicConstant() {
+ return FOO;
+ }
+
+ public static String getProperty() {
+ return getProperty("foo");
+ }
+
+ public static String getProperty(int i, String key) {
+ if (i <= 0) {
+ return getProperty(key);
+ }
+ int counter = i;
+ return getProperty(--counter, key);
+ }
+
+ public static String getProperty(String key) {
+ return System.getProperty(key);
+ }
+
+ private static Integer n;
+ static {
+ n = Integer.valueOf(999);
+ }
+
+ public static int readPrivateField() {
+ return n;
+ }
+}
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/example/src/main/java/org/apache/commons/weaver/privilizer/example/Utils.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java (original)
+++ commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java Wed Feb 12 22:40:06 2014
@@ -1,77 +1,77 @@
-/*
- * 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.commons.weaver.privilizer.example;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class UsingBlueprintsTest {
-
- private UsingBlueprints usingBlueprints;
-
- @Before
- public void setUp() throws Exception {
- Setup.setProperty("foo", "foo-value");
- Setup.setProperty("bar", "bar-value");
- Setup.setProperty("baz", "baz-value");
- usingBlueprints = new UsingBlueprints();
- }
-
- @Test
- public void testUtilsReadPublicConstant() {
- assertEquals(Utils.FOO, usingBlueprints.utilsReadPublicConstant());
- }
-
- @Test
- public void testUtilsReadPrivateField() {
- assertEquals(999, usingBlueprints.utilsReadPrivateField());
- }
-
- @Test
- public void testUtilsGetProperty() {
- assertEquals("foo-value", usingBlueprints.utilsGetProperty());
- }
-
- @Test
- public void testUtilsGetProperty_String() {
- assertEquals("foo-value", usingBlueprints.utilsGetProperty("foo"));
- assertEquals("bar-value", usingBlueprints.utilsGetProperty("bar"));
- assertEquals("baz-value", usingBlueprints.utilsGetProperty("baz"));
- }
-
- @Test
- public void testUtilsGetProperty_int_String() {
- assertEquals("foo-value", usingBlueprints.utilsGetProperty(2, "foo"));
- assertEquals("bar-value", usingBlueprints.utilsGetProperty(2, "bar"));
- assertEquals("baz-value", usingBlueprints.utilsGetProperty(2, "baz"));
- }
-
- @Test
- public void testMoreGetProperty() {
- assertEquals("bar-value", usingBlueprints.moreGetProperty());
- }
-
- @Test
- public void testMoreGetTopStackElementClassName() {
- assertEquals(Utils.More.class.getName(), usingBlueprints.moreGetTopStackElementClassName());
- }
-
-}
+/*
+ * 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.commons.weaver.privilizer.example;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class UsingBlueprintsTest {
+
+ private UsingBlueprints usingBlueprints;
+
+ @Before
+ public void setUp() throws Exception {
+ Setup.setProperty("foo", "foo-value");
+ Setup.setProperty("bar", "bar-value");
+ Setup.setProperty("baz", "baz-value");
+ usingBlueprints = new UsingBlueprints();
+ }
+
+ @Test
+ public void testUtilsReadPublicConstant() {
+ assertEquals(Utils.FOO, usingBlueprints.utilsReadPublicConstant());
+ }
+
+ @Test
+ public void testUtilsReadPrivateField() {
+ assertEquals(999, usingBlueprints.utilsReadPrivateField());
+ }
+
+ @Test
+ public void testUtilsGetProperty() {
+ assertEquals("foo-value", usingBlueprints.utilsGetProperty());
+ }
+
+ @Test
+ public void testUtilsGetProperty_String() {
+ assertEquals("foo-value", usingBlueprints.utilsGetProperty("foo"));
+ assertEquals("bar-value", usingBlueprints.utilsGetProperty("bar"));
+ assertEquals("baz-value", usingBlueprints.utilsGetProperty("baz"));
+ }
+
+ @Test
+ public void testUtilsGetProperty_int_String() {
+ assertEquals("foo-value", usingBlueprints.utilsGetProperty(2, "foo"));
+ assertEquals("bar-value", usingBlueprints.utilsGetProperty(2, "bar"));
+ assertEquals("baz-value", usingBlueprints.utilsGetProperty(2, "baz"));
+ }
+
+ @Test
+ public void testMoreGetProperty() {
+ assertEquals("bar-value", usingBlueprints.moreGetProperty());
+ }
+
+ @Test
+ public void testMoreGetTopStackElementClassName() {
+ assertEquals(Utils.More.class.getName(), usingBlueprints.moreGetTopStackElementClassName());
+ }
+
+}
Propchange: commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/example/src/test/java/org/apache/commons/weaver/privilizer/example/UsingBlueprintsTest.java
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/maven-plugin/src/main/java/org/apache/commons/weaver/maven/AbstractPrepareMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/maven-plugin/src/main/java/org/apache/commons/weaver/maven/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/maven-plugin/src/main/java/org/apache/commons/weaver/maven/package-info.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (original)
+++ commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml Wed Feb 12 22:40:06 2014
@@ -1,51 +1,51 @@
-<?xml version="1.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.
--->
-<lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <goals>
- <goal>prepare</goal>
- <goal>test-prepare</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>true</runOnIncremental>
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <goals>
- <goal>weave</goal>
- <goal>test-weave</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>true</runOnIncremental>
- <runOnConfiguration>false</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
+<?xml version="1.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.
+-->
+<lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <goals>
+ <goal>prepare</goal>
+ <goal>test-prepare</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <goals>
+ <goal>weave</goal>
+ <goal>test-weave</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>false</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
</lifecycleMappingMetadata>
\ No newline at end of file
Propchange: commons/proper/weaver/trunk/maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/pom.xml
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java Wed Feb 12 22:40:06 2014
@@ -1,49 +1,49 @@
-/*
- * 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.commons.weaver.normalizer.example;
-
-public abstract class ContrivedWrapper {
- public final Object value;
-
- protected ContrivedWrapper(Object value) {
- this.value = value;
- }
-
- protected ContrivedWrapper(int value) {
- this.value = Integer.valueOf(value);
- }
-
- @Override
- public final boolean equals(Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof ContrivedWrapper)) {
- return false;
- }
- final ContrivedWrapper other = (ContrivedWrapper) obj;
- return value.equals(other.value);
- }
-
- @Override
- public int hashCode() {
- return 41 << 4 | value.hashCode();
- }
-
-}
+/*
+ * 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.commons.weaver.normalizer.example;
+
+public abstract class ContrivedWrapper {
+ public final Object value;
+
+ protected ContrivedWrapper(Object value) {
+ this.value = value;
+ }
+
+ protected ContrivedWrapper(int value) {
+ this.value = Integer.valueOf(value);
+ }
+
+ @Override
+ public final boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof ContrivedWrapper)) {
+ return false;
+ }
+ final ContrivedWrapper other = (ContrivedWrapper) obj;
+ return value.equals(other.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return 41 << 4 | value.hashCode();
+ }
+
+}
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/ContrivedWrapper.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java Wed Feb 12 22:40:06 2014
@@ -1,33 +1,33 @@
-/*
- * 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.commons.weaver.normalizer.example;
-
-import org.apache.commons.lang3.reflect.TypeLiteral;
-
-public class InstanceMembers {
- public final TypeLiteral<String> stringType = new TypeLiteral<String>() { };
- public final TypeLiteral<String> stringType2 = new TypeLiteral<String>() { };
- public final TypeLiteral<Iterable<Integer>> integerIterableType = new TypeLiteral<Iterable<Integer>>() { };
-
- public final ContrivedWrapper wrappedObject = new ContrivedWrapper(new Object()) { };
- public final ContrivedWrapper wrappedString = new ContrivedWrapper("foo") { };
- public final ContrivedWrapper wrappedString2 = new ContrivedWrapper("foo") { };
- public final ContrivedWrapper wrappedInteger = new ContrivedWrapper(Integer.valueOf(1)) { };
- public final ContrivedWrapper wrappedInt = new ContrivedWrapper(1) { };
-}
+/*
+ * 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.commons.weaver.normalizer.example;
+
+import org.apache.commons.lang3.reflect.TypeLiteral;
+
+public class InstanceMembers {
+ public final TypeLiteral<String> stringType = new TypeLiteral<String>() { };
+ public final TypeLiteral<String> stringType2 = new TypeLiteral<String>() { };
+ public final TypeLiteral<Iterable<Integer>> integerIterableType = new TypeLiteral<Iterable<Integer>>() { };
+
+ public final ContrivedWrapper wrappedObject = new ContrivedWrapper(new Object()) { };
+ public final ContrivedWrapper wrappedString = new ContrivedWrapper("foo") { };
+ public final ContrivedWrapper wrappedString2 = new ContrivedWrapper("foo") { };
+ public final ContrivedWrapper wrappedInteger = new ContrivedWrapper(Integer.valueOf(1)) { };
+ public final ContrivedWrapper wrappedInt = new ContrivedWrapper(1) { };
+}
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/InstanceMembers.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java Wed Feb 12 22:40:06 2014
@@ -1,36 +1,36 @@
-/*
- * 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.commons.weaver.normalizer.example;
-
-import org.apache.commons.lang3.reflect.TypeLiteral;
-
-public final class StaticMembers {
- private StaticMembers() {
- }
-
- public static final TypeLiteral<String> STRING_TYPE = new TypeLiteral<String>() { };
- public static final TypeLiteral<String> STRING_TYPE2 = new TypeLiteral<String>() { };
- public static final TypeLiteral<Iterable<Integer>> INTEGER_ITERABLE_TYPE = new TypeLiteral<Iterable<Integer>>() { };
-
- public static final ContrivedWrapper WRAPPED_OBJECT = new ContrivedWrapper(new Object()) { };
- public static final ContrivedWrapper WRAPPED_STRING = new ContrivedWrapper("foo") { };
- public static final ContrivedWrapper WRAPPED_STRING2 = new ContrivedWrapper("foo") { };
- public static final ContrivedWrapper WRAPPED_INTEGER = new ContrivedWrapper(Integer.valueOf(1)) { };
- public static final ContrivedWrapper WRAPPED_INT = new ContrivedWrapper(1) { };
-}
+/*
+ * 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.commons.weaver.normalizer.example;
+
+import org.apache.commons.lang3.reflect.TypeLiteral;
+
+public final class StaticMembers {
+ private StaticMembers() {
+ }
+
+ public static final TypeLiteral<String> STRING_TYPE = new TypeLiteral<String>() { };
+ public static final TypeLiteral<String> STRING_TYPE2 = new TypeLiteral<String>() { };
+ public static final TypeLiteral<Iterable<Integer>> INTEGER_ITERABLE_TYPE = new TypeLiteral<Iterable<Integer>>() { };
+
+ public static final ContrivedWrapper WRAPPED_OBJECT = new ContrivedWrapper(new Object()) { };
+ public static final ContrivedWrapper WRAPPED_STRING = new ContrivedWrapper("foo") { };
+ public static final ContrivedWrapper WRAPPED_STRING2 = new ContrivedWrapper("foo") { };
+ public static final ContrivedWrapper WRAPPED_INTEGER = new ContrivedWrapper(Integer.valueOf(1)) { };
+ public static final ContrivedWrapper WRAPPED_INT = new ContrivedWrapper(1) { };
+}
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/main/java/org/apache/commons/weaver/normalizer/example/StaticMembers.java
('svn:executable' removed)
Modified: commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java?rev=1567781&r1=1567780&r2=1567781&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java (original)
+++ commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java Wed Feb 12 22:40:06 2014
@@ -1,63 +1,63 @@
-/*
- * 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.commons.weaver.normalizer.example;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class NormalizerTest {
- private InstanceMembers instanceMembers;
-
- @Before
- public void setup() {
- instanceMembers = new InstanceMembers();
- }
-
- @Test
- public void testGenericType() {
- final Class<?> stringLiteral = StaticMembers.STRING_TYPE.getClass();
- assertTrue(stringLiteral.isInstance(StaticMembers.STRING_TYPE2));
- assertFalse(stringLiteral.isInstance(StaticMembers.INTEGER_ITERABLE_TYPE));
- assertTrue(stringLiteral.isInstance(instanceMembers.stringType));
- assertTrue(stringLiteral.isInstance(instanceMembers.stringType2));
- assertFalse(stringLiteral.isInstance(instanceMembers.integerIterableType));
-
- final Class<?> integerIterable = StaticMembers.INTEGER_ITERABLE_TYPE.getClass();
- assertTrue(integerIterable.isInstance(instanceMembers.integerIterableType));
- }
-
- @Test
- public void testAlternateConstructors() {
- final Class<?> objectWrapper = StaticMembers.WRAPPED_OBJECT.getClass();
- assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_STRING));
- assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_STRING2));
- assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_INTEGER));
- assertFalse(objectWrapper.isInstance(StaticMembers.WRAPPED_INT));
- assertTrue(objectWrapper.isInstance(instanceMembers.wrappedObject));
- assertTrue(objectWrapper.isInstance(instanceMembers.wrappedString));
- assertTrue(objectWrapper.isInstance(instanceMembers.wrappedString2));
- assertTrue(objectWrapper.isInstance(instanceMembers.wrappedInteger));
- assertFalse(objectWrapper.isInstance(instanceMembers.wrappedInt));
- final Class<?> intWrapper = StaticMembers.WRAPPED_INT.getClass();
- assertTrue(intWrapper.isInstance(instanceMembers.wrappedInt));
- }
-}
+/*
+ * 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.commons.weaver.normalizer.example;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class NormalizerTest {
+ private InstanceMembers instanceMembers;
+
+ @Before
+ public void setup() {
+ instanceMembers = new InstanceMembers();
+ }
+
+ @Test
+ public void testGenericType() {
+ final Class<?> stringLiteral = StaticMembers.STRING_TYPE.getClass();
+ assertTrue(stringLiteral.isInstance(StaticMembers.STRING_TYPE2));
+ assertFalse(stringLiteral.isInstance(StaticMembers.INTEGER_ITERABLE_TYPE));
+ assertTrue(stringLiteral.isInstance(instanceMembers.stringType));
+ assertTrue(stringLiteral.isInstance(instanceMembers.stringType2));
+ assertFalse(stringLiteral.isInstance(instanceMembers.integerIterableType));
+
+ final Class<?> integerIterable = StaticMembers.INTEGER_ITERABLE_TYPE.getClass();
+ assertTrue(integerIterable.isInstance(instanceMembers.integerIterableType));
+ }
+
+ @Test
+ public void testAlternateConstructors() {
+ final Class<?> objectWrapper = StaticMembers.WRAPPED_OBJECT.getClass();
+ assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_STRING));
+ assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_STRING2));
+ assertTrue(objectWrapper.isInstance(StaticMembers.WRAPPED_INTEGER));
+ assertFalse(objectWrapper.isInstance(StaticMembers.WRAPPED_INT));
+ assertTrue(objectWrapper.isInstance(instanceMembers.wrappedObject));
+ assertTrue(objectWrapper.isInstance(instanceMembers.wrappedString));
+ assertTrue(objectWrapper.isInstance(instanceMembers.wrappedString2));
+ assertTrue(objectWrapper.isInstance(instanceMembers.wrappedInteger));
+ assertFalse(objectWrapper.isInstance(instanceMembers.wrappedInt));
+ final Class<?> intWrapper = StaticMembers.WRAPPED_INT.getClass();
+ assertTrue(intWrapper.isInstance(instanceMembers.wrappedInt));
+ }
+}
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/example/src/test/java/org/apache/commons/weaver/normalizer/example/NormalizerTest.java
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/modules/normalizer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/pom.xml
('svn:executable' removed)
Propchange: commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/weaver/trunk/modules/normalizer/weaver/pom.xml
('svn:executable' removed)