diff options
author | Andy Clement <aclement@pivotal.io> | 2019-01-23 13:02:59 -0800 |
---|---|---|
committer | Andy Clement <aclement@pivotal.io> | 2019-01-23 13:02:59 -0800 |
commit | 68e9bc60f98ece8557eb6499326644a956d2dcf9 (patch) | |
tree | dba0b1f8968cc7a92de527890ed2d20a71448208 /bridge | |
parent | 6245346ab0fe0f19db977c86389e31517ed068ec (diff) | |
download | aspectj-68e9bc60f98ece8557eb6499326644a956d2dcf9.tar.gz aspectj-68e9bc60f98ece8557eb6499326644a956d2dcf9.zip |
mavenized bridge module
Diffstat (limited to 'bridge')
-rw-r--r-- | bridge/.classpath | 9 | ||||
-rw-r--r-- | bridge/.cvsignore | 5 | ||||
-rw-r--r-- | bridge/.isJava5 | 1 | ||||
-rw-r--r-- | bridge/.project | 18 | ||||
-rw-r--r-- | bridge/build.xml | 6 | ||||
-rw-r--r-- | bridge/pom.xml | 25 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/AbortException.java (renamed from bridge/src/org/aspectj/bridge/AbortException.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/Constants.java (renamed from bridge/src/org/aspectj/bridge/Constants.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/CountingMessageHandler.java (renamed from bridge/src/org/aspectj/bridge/CountingMessageHandler.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/ICommand.java (renamed from bridge/src/org/aspectj/bridge/ICommand.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/ILifecycleAware.java (renamed from bridge/src/org/aspectj/bridge/ILifecycleAware.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/IMessage.java (renamed from bridge/src/org/aspectj/bridge/IMessage.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/IMessageContext.java (renamed from bridge/src/org/aspectj/bridge/IMessageContext.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/IMessageHandler.java (renamed from bridge/src/org/aspectj/bridge/IMessageHandler.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/IMessageHolder.java (renamed from bridge/src/org/aspectj/bridge/IMessageHolder.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/IProgressListener.java (renamed from bridge/src/org/aspectj/bridge/IProgressListener.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/ISourceLocation.java (renamed from bridge/src/org/aspectj/bridge/ISourceLocation.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/Message.java (renamed from bridge/src/org/aspectj/bridge/Message.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/MessageHandler.java (renamed from bridge/src/org/aspectj/bridge/MessageHandler.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/MessageUtil.java (renamed from bridge/src/org/aspectj/bridge/MessageUtil.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/MessageWriter.java (renamed from bridge/src/org/aspectj/bridge/MessageWriter.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java (renamed from bridge/src/org/aspectj/bridge/ReflectionFactory.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/SourceLocation.java (renamed from bridge/src/org/aspectj/bridge/SourceLocation.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/Version.java (renamed from bridge/src/org/aspectj/bridge/Version.java) | 2 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java (renamed from bridge/src/org/aspectj/bridge/WeaveMessage.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java (renamed from bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/context/ContextFormatter.java (renamed from bridge/src/org/aspectj/bridge/context/ContextFormatter.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/context/ContextToken.java (renamed from bridge/src/org/aspectj/bridge/context/ContextToken.java) | 0 | ||||
-rw-r--r-- | bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java (renamed from bridge/src/org/aspectj/bridge/context/PinpointingMessageHandler.java) | 0 | ||||
-rw-r--r-- | bridge/src/test/java/org/aspectj/bridge/CountingMessageHandlerTest.java (renamed from bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java) | 0 | ||||
-rw-r--r-- | bridge/src/test/java/org/aspectj/bridge/MessageTest.java (renamed from bridge/testsrc/org/aspectj/bridge/MessageTest.java) | 0 | ||||
-rw-r--r-- | bridge/src/test/java/org/aspectj/bridge/VersionTest.java (renamed from bridge/testsrc/org/aspectj/bridge/VersionTest.java) | 0 | ||||
-rw-r--r-- | bridge/src/test/java/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java (renamed from bridge/testsrc/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java) | 0 | ||||
-rw-r--r-- | bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java | 35 | ||||
-rw-r--r-- | bridge/testsrc/org/aspectj/bridge/BridgeTests.java | 35 |
35 files changed, 26 insertions, 110 deletions
diff --git a/bridge/.classpath b/bridge/.classpath deleted file mode 100644 index 6544d226b..000000000 --- a/bridge/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="testsrc"/> - <classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/> - <classpathentry kind="src" path="/util"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/bridge/.cvsignore b/bridge/.cvsignore deleted file mode 100644 index 8bdf2ac1e..000000000 --- a/bridge/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -ant.properties -bridge.mf.txt - -bintest diff --git a/bridge/.isJava5 b/bridge/.isJava5 deleted file mode 100644 index 136d06384..000000000 --- a/bridge/.isJava5 +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/bridge/.project b/bridge/.project deleted file mode 100644 index 91c755134..000000000 --- a/bridge/.project +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>bridge</name> - <comment></comment> - <projects> - <project>util</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/bridge/build.xml b/bridge/build.xml deleted file mode 100644 index 349b0aa8c..000000000 --- a/bridge/build.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="bridge" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/bridge/pom.xml b/bridge/pom.xml new file mode 100644 index 000000000..03ddca049 --- /dev/null +++ b/bridge/pom.xml @@ -0,0 +1,25 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.aspectj</groupId> + <artifactId>aspectj-parent</artifactId> + <version>1.9.3.BUILD-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>bridge</artifactId> + <packaging>jar</packaging> + <name>bridge</name> + + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>util</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + +</project> diff --git a/bridge/src/org/aspectj/bridge/AbortException.java b/bridge/src/main/java/org/aspectj/bridge/AbortException.java index acde7cd28..acde7cd28 100644 --- a/bridge/src/org/aspectj/bridge/AbortException.java +++ b/bridge/src/main/java/org/aspectj/bridge/AbortException.java diff --git a/bridge/src/org/aspectj/bridge/Constants.java b/bridge/src/main/java/org/aspectj/bridge/Constants.java index 31f239678..31f239678 100644 --- a/bridge/src/org/aspectj/bridge/Constants.java +++ b/bridge/src/main/java/org/aspectj/bridge/Constants.java diff --git a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java b/bridge/src/main/java/org/aspectj/bridge/CountingMessageHandler.java index 4ce550876..4ce550876 100644 --- a/bridge/src/org/aspectj/bridge/CountingMessageHandler.java +++ b/bridge/src/main/java/org/aspectj/bridge/CountingMessageHandler.java diff --git a/bridge/src/org/aspectj/bridge/ICommand.java b/bridge/src/main/java/org/aspectj/bridge/ICommand.java index b77d58e59..b77d58e59 100644 --- a/bridge/src/org/aspectj/bridge/ICommand.java +++ b/bridge/src/main/java/org/aspectj/bridge/ICommand.java diff --git a/bridge/src/org/aspectj/bridge/ILifecycleAware.java b/bridge/src/main/java/org/aspectj/bridge/ILifecycleAware.java index c5ac9b149..c5ac9b149 100644 --- a/bridge/src/org/aspectj/bridge/ILifecycleAware.java +++ b/bridge/src/main/java/org/aspectj/bridge/ILifecycleAware.java diff --git a/bridge/src/org/aspectj/bridge/IMessage.java b/bridge/src/main/java/org/aspectj/bridge/IMessage.java index a32a631e6..a32a631e6 100644 --- a/bridge/src/org/aspectj/bridge/IMessage.java +++ b/bridge/src/main/java/org/aspectj/bridge/IMessage.java diff --git a/bridge/src/org/aspectj/bridge/IMessageContext.java b/bridge/src/main/java/org/aspectj/bridge/IMessageContext.java index 2f5512a1d..2f5512a1d 100644 --- a/bridge/src/org/aspectj/bridge/IMessageContext.java +++ b/bridge/src/main/java/org/aspectj/bridge/IMessageContext.java diff --git a/bridge/src/org/aspectj/bridge/IMessageHandler.java b/bridge/src/main/java/org/aspectj/bridge/IMessageHandler.java index 6dcdfeafb..6dcdfeafb 100644 --- a/bridge/src/org/aspectj/bridge/IMessageHandler.java +++ b/bridge/src/main/java/org/aspectj/bridge/IMessageHandler.java diff --git a/bridge/src/org/aspectj/bridge/IMessageHolder.java b/bridge/src/main/java/org/aspectj/bridge/IMessageHolder.java index fdf2a6779..fdf2a6779 100644 --- a/bridge/src/org/aspectj/bridge/IMessageHolder.java +++ b/bridge/src/main/java/org/aspectj/bridge/IMessageHolder.java diff --git a/bridge/src/org/aspectj/bridge/IProgressListener.java b/bridge/src/main/java/org/aspectj/bridge/IProgressListener.java index 4326f7263..4326f7263 100644 --- a/bridge/src/org/aspectj/bridge/IProgressListener.java +++ b/bridge/src/main/java/org/aspectj/bridge/IProgressListener.java diff --git a/bridge/src/org/aspectj/bridge/ISourceLocation.java b/bridge/src/main/java/org/aspectj/bridge/ISourceLocation.java index 7ad9423c2..7ad9423c2 100644 --- a/bridge/src/org/aspectj/bridge/ISourceLocation.java +++ b/bridge/src/main/java/org/aspectj/bridge/ISourceLocation.java diff --git a/bridge/src/org/aspectj/bridge/Message.java b/bridge/src/main/java/org/aspectj/bridge/Message.java index a4f17072b..a4f17072b 100644 --- a/bridge/src/org/aspectj/bridge/Message.java +++ b/bridge/src/main/java/org/aspectj/bridge/Message.java diff --git a/bridge/src/org/aspectj/bridge/MessageHandler.java b/bridge/src/main/java/org/aspectj/bridge/MessageHandler.java index 6fd8539cc..6fd8539cc 100644 --- a/bridge/src/org/aspectj/bridge/MessageHandler.java +++ b/bridge/src/main/java/org/aspectj/bridge/MessageHandler.java diff --git a/bridge/src/org/aspectj/bridge/MessageUtil.java b/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java index 6d85ea6f9..6d85ea6f9 100644 --- a/bridge/src/org/aspectj/bridge/MessageUtil.java +++ b/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java diff --git a/bridge/src/org/aspectj/bridge/MessageWriter.java b/bridge/src/main/java/org/aspectj/bridge/MessageWriter.java index 3fbeb91b0..3fbeb91b0 100644 --- a/bridge/src/org/aspectj/bridge/MessageWriter.java +++ b/bridge/src/main/java/org/aspectj/bridge/MessageWriter.java diff --git a/bridge/src/org/aspectj/bridge/ReflectionFactory.java b/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java index 8eb65b3a0..8eb65b3a0 100644 --- a/bridge/src/org/aspectj/bridge/ReflectionFactory.java +++ b/bridge/src/main/java/org/aspectj/bridge/ReflectionFactory.java diff --git a/bridge/src/org/aspectj/bridge/SourceLocation.java b/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java index 739dd52ab..739dd52ab 100644 --- a/bridge/src/org/aspectj/bridge/SourceLocation.java +++ b/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java diff --git a/bridge/src/org/aspectj/bridge/Version.java b/bridge/src/main/java/org/aspectj/bridge/Version.java index 835127c75..367efaf73 100644 --- a/bridge/src/org/aspectj/bridge/Version.java +++ b/bridge/src/main/java/org/aspectj/bridge/Version.java @@ -37,7 +37,7 @@ public class Version { * Time text set by build script using SIMPLE_DATE_FORMAT. * (if DEVELOPMENT version, invalid) */ - public static final String time_text = "Friday Nov 18, 2016 at 16:34:52 GMT"; + public static final String time_text = "Tuesday Jan 15, 2019 at 00:53:54 GMT"; /** * time in seconds-since-... format, used by programmatic clients. diff --git a/bridge/src/org/aspectj/bridge/WeaveMessage.java b/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java index 2c697a811..2c697a811 100644 --- a/bridge/src/org/aspectj/bridge/WeaveMessage.java +++ b/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java diff --git a/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java b/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java index 28a414acd..28a414acd 100644 --- a/bridge/src/org/aspectj/bridge/context/CompilationAndWeavingContext.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java diff --git a/bridge/src/org/aspectj/bridge/context/ContextFormatter.java b/bridge/src/main/java/org/aspectj/bridge/context/ContextFormatter.java index 9f1b591d7..9f1b591d7 100644 --- a/bridge/src/org/aspectj/bridge/context/ContextFormatter.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/ContextFormatter.java diff --git a/bridge/src/org/aspectj/bridge/context/ContextToken.java b/bridge/src/main/java/org/aspectj/bridge/context/ContextToken.java index 2415fa72e..2415fa72e 100644 --- a/bridge/src/org/aspectj/bridge/context/ContextToken.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/ContextToken.java diff --git a/bridge/src/org/aspectj/bridge/context/PinpointingMessageHandler.java b/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java index c54ff6789..c54ff6789 100644 --- a/bridge/src/org/aspectj/bridge/context/PinpointingMessageHandler.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java diff --git a/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java b/bridge/src/test/java/org/aspectj/bridge/CountingMessageHandlerTest.java index dc357a8b1..dc357a8b1 100644 --- a/bridge/testsrc/org/aspectj/bridge/CountingMessageHandlerTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/CountingMessageHandlerTest.java diff --git a/bridge/testsrc/org/aspectj/bridge/MessageTest.java b/bridge/src/test/java/org/aspectj/bridge/MessageTest.java index be30c48ba..be30c48ba 100644 --- a/bridge/testsrc/org/aspectj/bridge/MessageTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/MessageTest.java diff --git a/bridge/testsrc/org/aspectj/bridge/VersionTest.java b/bridge/src/test/java/org/aspectj/bridge/VersionTest.java index cee4c8450..cee4c8450 100644 --- a/bridge/testsrc/org/aspectj/bridge/VersionTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/VersionTest.java diff --git a/bridge/testsrc/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java b/bridge/src/test/java/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java index 825a52b61..825a52b61 100644 --- a/bridge/testsrc/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/context/CompilationAndWeavingContextTest.java diff --git a/bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java b/bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java deleted file mode 100644 index 5811f987d..000000000 --- a/bridge/testsrc/org/aspectj/bridge/BridgeModuleTests.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.aspectj.bridge; -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -// default package - -import org.aspectj.bridge.context.CompilationAndWeavingContextTest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class BridgeModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(BridgeModuleTests.class.getName()); - suite.addTest(org.aspectj.bridge.BridgeTests.suite()); - suite.addTestSuite(CompilationAndWeavingContextTest.class); - return suite; - } - - public BridgeModuleTests(String name) { super(name); } - -} diff --git a/bridge/testsrc/org/aspectj/bridge/BridgeTests.java b/bridge/testsrc/org/aspectj/bridge/BridgeTests.java deleted file mode 100644 index 5d0b1d0f8..000000000 --- a/bridge/testsrc/org/aspectj/bridge/BridgeTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.bridge; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class BridgeTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(BridgeTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(CountingMessageHandlerTest.class); - suite.addTestSuite(MessageTest.class); - suite.addTestSuite(VersionTest.class); - //$JUnit-END$ - return suite; - } - - public BridgeTests(String name) { super(name); } - -} |