DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Achim D. Brucker 2015-06-10 23:58:55 +02:00
parent 7bbb86292d 93a522eecd
commit f879566711
94 changed files with 289 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,4 +1,5 @@
language: android
jdk: oraclejdk8
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
@ -13,6 +14,5 @@ sudo: false
cache:
directories:
- $HOME/.m2
- $TRAVIS_BUILD_DIR/com.ibm.wala.cast.java.polyglot/lib
- $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib

2
com.ibm.wala-feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.ibm.wala-feature"
label="%featureName"
version="1.3.7"
version="1.3.8.qualifier"
provider-name="%providerName">
<plugin

2
com.ibm.wala-feature/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala-feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.ibm.wala-repository/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala-repository</artifactId>
<packaging>eclipse-repository</packaging>

2
com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA Cast Java Polyglot Test Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.cast.java.polyglot.test.Activator
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",

4
com.ibm.wala.cast.java.polyglot.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.java.polyglot.test</artifactId>
<packaging>eclipse-plugin</packaging>
@ -20,7 +20,7 @@
<phase>test</phase>
<configuration>
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
<argLine>-Xmx800M -ea</argLine>
<argLine>-Xmx1200M -ea</argLine>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<workingDirectory>${basedir}/../com.ibm.wala.cast.java.test.data</workingDirectory>
</configuration>

2
com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA CAst Java Polyglot Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.cast.java,
com.ibm.wala.cast,

2
com.ibm.wala.cast.java.polyglot/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.java.polyglot</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
View File

@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Data Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.java.test.data
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: IBM
Bundle-RequiredExecutionEnvironment: JavaSE-1.7

2
com.ibm.wala.cast.java.test.data/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.java.test.data</artifactId>
<packaging>eclipse-plugin</packaging>

7
com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java
View File

@ -10,9 +10,8 @@
*****************************************************************************/
public class ArrayLiteral1 {
public static void main(String[] args) {
ArrayLiteral1 al1= new ArrayLiteral1();
int[] a= new int[] { 0, 1, 2, 3, 5 };
Object[] b= new Object[] { null, "hi", new Integer(55), new int[] { 3, 1, 4 } };
ArrayLiteral1 al1= new ArrayLiteral1();
int[] a= new int[] { 0, 1, 2, 3, 5 };
Object[] b= new Object[] { null, "hi", new Integer(55), new int[] { 3, 1, 4 } };
}
}

2
com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Java AST WALA Test Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.java.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.core.tests,

2
com.ibm.wala.cast.java.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.java.test</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.java/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Java Source WALA Front End
Bundle-SymbolicName: com.ibm.wala.cast.java
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.cast.java.JavaSourcePlugin
Bundle-Vendor: rfuhrer@watson.ibm.com
Require-Bundle: com.ibm.wala.cast,

2
com.ibm.wala.cast.java/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.java</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Nu_validator
Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Export-Package: com.ibm.wala.cast.js.html.nu_validator
Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0",
com.ibm.wala.cast.js.rhino.test;bundle-version="1.0.0",

2
com.ibm.wala.cast.js.html.nu_validator/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.js.html.nu_validator</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Test Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.js.rhino.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
com.ibm.wala.cast.js;bundle-version="1.0.0",

2
com.ibm.wala.cast.js.rhino.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.js.rhino.test</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Rhino Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.js.rhino
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.js.rhino.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.core.runtime,

2
com.ibm.wala.cast.js.rhino/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.js.rhino</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Eclipse-LazyStart: true
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.cast.js.test.data;singleton:=true
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy

2
com.ibm.wala.cast.js.test.data/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.js.test.data</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch
View File

@ -14,7 +14,7 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;com.ibm.wala.cast.js.test&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.cast.js.test&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.cast.js.test/examples-src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.cast.js.test.data/examples-src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>

2
com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA JavaScript Test Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.js.test;singleton:=true
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-ClassPath: test.jar
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.cast.js,

2
com.ibm.wala.cast.js.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.js.test</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast.js/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JavaScript Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.js;singleton:=true
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-ClassPath: .,
lib/jericho-html-3.2.jar
Bundle-Activator: com.ibm.wala.cast.js.JavaScriptPlugin

2
com.ibm.wala.cast.js/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.cast.js</artifactId>

2
com.ibm.wala.cast.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CAst Test Plug-in
Bundle-SymbolicName: com.ibm.wala.cast.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: IBM
Require-Bundle:
org.junit;bundle-version="4.0.0",

2
com.ibm.wala.cast.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast.test</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.cast/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA CAst core Plug-in
Bundle-SymbolicName: com.ibm.wala.cast
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.cast.plugin.AstPlugin
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.core,

2
com.ibm.wala.cast/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.cast</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.core.testdata/.classpath
View File

@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="output" path="bin"/>
</classpath>

6
com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
View File

@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

4
com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Testdata Plug-in
Bundle-SymbolicName: com.ibm.wala.core.testdata
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: IBM
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Eclipse-BuddyPolicy: registered

88
com.ibm.wala.core.testdata/build.xml
View File

@ -12,8 +12,8 @@
<property name="javacVerbose" value="false"/>
<property name="logExtension" value=".log"/>
<property name="compilerArg" value=""/>
<property name="javacSource" value="1.5"/>
<property name="javacTarget" value="1.5"/>
<property name="javacSource" value="1.8"/>
<property name="javacTarget" value="1.8"/>
<property name="dir_bootclasspath" value="${java.home}/lib"/>
<path id="path_bootclasspath">
<fileset dir="${dir_bootclasspath}">
@ -117,49 +117,57 @@
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
<param name="destination.temp.folder" value="${temp.folder}/jdk"/>
</antcall>
<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/dalvik/"/>
</antcall>
<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/dalvik/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/dalvik/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/jdk/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/jdk/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>
</target>
<target name="@dot" depends="init" description="Create jar: com.ibm.wala.core.testdata @dot.">
<delete dir="${temp.folder}/@dot.bin"/>
<mkdir dir="${temp.folder}/@dot.bin"/>
<path id="@dot.classpath">
</path>
<!-- compile the source code -->
<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
<classpath refid="@dot.classpath" />
<src path="src/" />
<exclude name="**/bak/"/>
<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</javac>
<!-- Copy necessary resources -->
<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
<fileset dir="src/" excludes="**/*.java, **/package.htm*" />
</copy>
<mkdir dir="${build.result.folder}"/>
<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
<fileset dir="${temp.folder}/@dot.bin" />
</copy>
<delete dir="${temp.folder}/@dot.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
<path id="@dot.classpath">
</path>
<!-- compile the source code -->
<javac destdir="${destdir}" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${jsv}" target="${jtv}" excludes="${excludes}">
<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
<classpath refid="@dot.classpath" />
<src path="src/"/>
<compilerarg line="-log '${destdir}${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</javac>
<!-- Copy necessary resources -->
<copy todir="${destdir}" failonerror="true" overwrite="false">
<fileset dir="src/" excludes="**/*.java, **/package.htm*"/>
</copy>
</target>
<target name="src.zip" depends="init" unless="src.zip">
<mkdir dir="${build.result.folder}"/>
<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
<fileset dir="src/" includes="**/*.java" />
<fileset dir="src/" includes="**/*.java"/>
</zip>
</target>
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: com.ibm.wala.core.testdata.">
<available property="@dot" file="${build.result.folder}/@dot"/>
<antcall target="@dot"/>
<antcall target="@dot">
<param name="destdir" value="${temp.folder}/jdk/@dot"/>
<param name="jsv" value="${bundleJavacSource}"/>
<param name="jtv" value="${bundleJavacTarget}"/>
<param name="excludes" value="**/bak/"/>
</antcall>
<antcall target="@dot">
<param name="destdir" value="${temp.folder}/dalvik/@dot"/>
<param name="jsv" value="1.6"/>
<param name="jtv" value="1.6"/>
<param name="excludes" value="**/bak/,**/SortingExample.java"/>
</antcall>
</target>
<target name="build.sources" depends="init">
@ -170,13 +178,13 @@
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.testdata_1.0.0"/>
<copy todir="${destination.temp.folder}/com.ibm.wala.core.testdata_1.0.0" failonerror="true" overwrite="false">
<fileset dir="${build.result.folder}/@dot" includes="**" />
<fileset dir="${destination.temp.folder}/@dot" includes="**"/>
</copy>
<copy todir="${destination.temp.folder}/com.ibm.wala.core.testdata_1.0.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="META-INF/" />
<fileset dir="${basedir}" includes="META-INF/"/>
</copy>
<copy todir="${destination.temp.folder}/com.ibm.wala.core.testdata_1.0.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}/classes" includes="**" />
<fileset dir="${basedir}/classes" includes="**"/>
</copy>
</target>
@ -211,14 +219,22 @@
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
<antcall target="build.sources"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
<param name="destination.temp.folder" value="${temp.folder}/jdk"/>
</antcall>
<antcall target="gather.sources">
<param name="destination.temp.folder" value="${temp.folder}/"/>
<param name="destination.temp.folder" value="${temp.folder}/jdk"/>
</antcall>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/dalvik"/>
</antcall>
<antcall target="gather.sources">
<param name="destination.temp.folder" value="${temp.folder}/dalvik"/>
</antcall>
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"/>
</delete>
<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<delete dir="${temp.folder}"/>

77
com.ibm.wala.core.testdata/pom.xml
View File

@ -5,39 +5,48 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.core.testdata</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant antfile="${basedir}/build.xml" target="build.update.jar" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.7</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<packaging>eclipse-plugin</packaging>
<artifactId>com.ibm.wala.core.testdata</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<property name="compile_classpath" refid="maven.compile.classpath" />
<ant antfile="${basedir}/build.xml" target="build.update.jar" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.8</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>

35
com.ibm.wala.core.testdata/src/lambda/SortingExample.java Normal file
View File

@ -0,0 +1,35 @@
package lambda;
import java.util.Arrays;
import java.util.Comparator;
public class SortingExample {
private final String[] strings;
public SortingExample(int n) {
this.strings = new String[n];
for(int i = 0; i < n; i++) {
strings[i] = "str" + i;
}
}
private String[] sort(Comparator<String> c) {
String[] strs = strings.clone();
Arrays.sort(strs, c);
return strs;
}
public String[] sortForward() {
return sort( (String l, String r) -> l.compareTo(r));
}
public String[] sortBackward() {
return sort( (String l, String r) -> r.compareTo(l));
}
public static void main(String[] args) {
SortingExample x = new SortingExample(10);
System.err.println( Arrays.toString( x.sortForward() ));
System.err.println( Arrays.toString( x.sortBackward() ));
}
}

4
com.ibm.wala.core.tests/META-INF/MANIFEST.MF
View File

@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.core.tests;singleton:=true
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: %providerName
Require-Bundle: com.ibm.wala.shrike,
com.ibm.wala.core,
org.eclipse.core.runtime,
com.ibm.wala.core.testdata;bundle-version="1.3.4",
com.ibm.wala.core.testdata,
org.junit;bundle-version="4.0.0",
org.apache.ant
Bundle-Localization: plugin

1
com.ibm.wala.core.tests/com.ibm.wala.core.testdata_1.0.0.jar
View File

@ -1 +0,0 @@
../com.ibm.wala.core.testdata/bin/com.ibm.wala.core.testdata_1.0.0.jar

7
com.ibm.wala.core.tests/dat/Java60RegressionExclusions.txt
View File

@ -1,3 +1,5 @@
apple\/.*
com\/apple\/.*
java\/awt\/.*
javax\/swing\/.*
sun\/awt\/.*
@ -10,4 +12,7 @@ com\/ibm\/crypto\/.*
com\/ibm\/security\/.*
org\/apache\/xerces\/.*
dalvik\/.*
java\/io\/ObjectStreamClass*
java\/io\/ObjectStreamClass*
jdk\/.*
org\/omg\/.*
org\/w3c\/.*

2
com.ibm.wala.core.tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.core.tests</artifactId>
<packaging>eclipse-plugin</packaging>

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java
View File

@ -11,8 +11,7 @@
package com.ibm.wala.core.tests.basic;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.util.collections.IteratorUtil;

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java
View File

@ -16,8 +16,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.util.graph.INodeWithNumberedEdges;

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java
View File

@ -12,8 +12,7 @@ package com.ibm.wala.core.tests.basic;
import java.util.List;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.util.Predicate;

1
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java
View File

@ -891,7 +891,6 @@ public class PrimitivesTest extends WalaTestCase {
testSingleBitVector(new OffsetBitVector(100, 10));
}
@SuppressWarnings("unchecked")
private void testSingleBitVector(BitVectorBase bv) {
// does the following not automatically scale the bitvector to
// a reasonable size?

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java
View File

@ -13,8 +13,7 @@ package com.ibm.wala.core.tests.basic;
import java.util.Iterator;
import java.util.Map;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.util.collections.HashMapFactory;

17
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java
View File

@ -151,6 +151,23 @@ public class CallGraphTest extends WalaTestCase {
}
}
@Test public void testJava8Smoke() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
CallGraphTestUtil.REGRESSION_EXCLUSIONS);
ClassHierarchy cha = ClassHierarchy.make(scope);
Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
"Llambda/SortingExample");
AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
boolean foundSortForward = false;
for (CGNode n : cg) {
if (n.toString().contains("sortForward")) {
foundSortForward = true;
}
}
Assert.assertTrue("expected for sortForward", foundSortForward);
}
@Test public void testSystemProperties() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
CallGraphTestUtil.REGRESSION_EXCLUSIONS);

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java
View File

@ -13,8 +13,7 @@ package com.ibm.wala.core.tests.callGraph;
import java.io.IOException;
import java.util.Set;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.core.tests.util.TestConstants;

3
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java
View File

@ -12,8 +12,7 @@ package com.ibm.wala.core.tests.cha;
import java.io.IOException;
import junit.framework.Assert;
import org.junit.Assert;
import org.junit.Test;
import com.ibm.wala.classLoader.IClass;

2
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java
View File

@ -36,7 +36,7 @@ public class LibraryVersionTest extends WalaTestCase {
@Test public void testLibraryVersion() throws IOException {
AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
System.err.println("java library version is " + scope.getJavaLibraryVersion());
Assert.assertTrue(scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries());
Assert.assertTrue(scope.isJava18Libraries() || scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries());
}
}

2
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
View File

@ -142,7 +142,7 @@ public abstract class DynamicCallGraphTestBase extends WalaTestCase {
public void edgesTest(CallGraph staticCG, CGNode caller, MethodReference calleeRef) {
if (! calleeRef.getName().equals(MethodReference.clinitName)) {
Set<CGNode> nodes = staticCG.getNodes(calleeRef);
Assert.assertEquals(1, nodes.size());
Assert.assertEquals("expected one node for " + calleeRef, 1, nodes.size());
CGNode callee = nodes.iterator().next();
Assert.assertTrue("no edge for " + caller + " --> " + callee, staticCG.getPossibleSites(caller, callee).hasNext());

2
com.ibm.wala.core/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Eclipse-LazyStart: true
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.core
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: com.ibm.wala.shrike,

6
com.ibm.wala.core/mvncentral.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.core</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
<packaging>jar</packaging>
<name>WALA Core</name>
<description>Core WALA analysis libraries</description>
@ -45,12 +45,12 @@
<dependency>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.util</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.shrike</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</dependency>
</dependencies>

2
com.ibm.wala.core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.core</artifactId>
<packaging>eclipse-plugin</packaging>

4
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java
View File

@ -411,6 +411,10 @@ public class AnalysisScope {
}
}
public boolean isJava18Libraries() throws IllegalStateException {
return getJavaLibraryVersion().startsWith("1.8");
}
public boolean isJava17Libraries() throws IllegalStateException {
return getJavaLibraryVersion().startsWith("1.7");
}

2
com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WalaDalvikBytecodeTests
Bundle-SymbolicName: com.ibm.wala.dalvik.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.dalvik.test.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.core.runtime,

2
com.ibm.wala.dalvik.test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.dalvik.test</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.dalvik/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA Dalvik Bytecode Frontend
Bundle-SymbolicName: com.ibm.wala.dalvik
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.ide;bundle-version="1.1.3",

2
com.ibm.wala.dalvik/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.dalvik</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.ide-feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.ibm.wala.ide-feature"
label="%featureName"
version="1.3.7"
version="1.3.8.qualifier"
provider-name="%providerName">
<plugin

2
com.ibm.wala.ide-feature/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide-feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA CAst Java JDT Test Plug-in
Bundle-SymbolicName: com.ibm.wala.ide.jdt.test
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.cast.java.jdt.test.Activator
Bundle-Vendor: IBM
Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",

2
com.ibm.wala.ide.jdt.test/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>

2
com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA IDE JDT components
Bundle-SymbolicName: com.ibm.wala.ide.jdt
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.ide.jdt.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.ui,

2
com.ibm.wala.ide.jdt/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide.jdt</artifactId>
<packaging>eclipse-plugin</packaging>

5
com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
View File

@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JSDT Tests
Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests
Bundle-Version: 1.3.7
Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests;singleton:=true
Bundle-Version: 1.3.8.qualifier
Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
com.ibm.wala.cast;bundle-version="1.0.0",
com.ibm.wala.cast.js;bundle-version="1.0.0",
@ -24,3 +24,4 @@ Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
Bundle-Activator: com.ibm.wala.ide.jsdt.tests.Activator
Export-Package: com.ibm.wala.ide.jsdt.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy

10
com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch
View File

File diff suppressed because one or more lines are too long

2
com.ibm.wala.ide.jsdt.tests/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide.jsdt.tests</artifactId>

2
com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Jsdt
Bundle-SymbolicName: com.ibm.wala.ide.jsdt
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.ide.jsdt.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.core.runtime,

2
com.ibm.wala.ide.jsdt/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide.jsdt</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.ide.tests;singleton:=true
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: %providerName
Require-Bundle: com.ibm.wala.shrike,
com.ibm.wala.core,

2
com.ibm.wala.ide.tests/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide.tests</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.ide/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Eclipse-LazyStart: true
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.ide
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.ide.plugin.CorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin

2
com.ibm.wala.ide/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.ide</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.scandroid/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SCanDroid
Bundle-SymbolicName: com.ibm.wala.scandroid
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Activator: com.ibm.wala.scandroid.Activator
Bundle-Vendor: IBM
Require-Bundle: org.eclipse.ui,

2
com.ibm.wala.scandroid/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.scandroid</artifactId>
<packaging>eclipse-plugin</packaging>

2
com.ibm.wala.shrike/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: com.ibm.wala.shrike
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin

4
com.ibm.wala.shrike/mvncentral.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.shrike</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
<packaging>jar</packaging>
<name>WALA Shrike</name>
<description>WALA Shrike library for bytecode reading and instrumentation</description>
@ -45,7 +45,7 @@
<dependency>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.util</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</dependency>
</dependencies>

2
com.ibm.wala.shrike/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.shrike</artifactId>
<packaging>eclipse-plugin</packaging>

24
com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java
View File

@ -152,10 +152,11 @@ public class InvokeDynamicInstruction extends Instruction implements IInvokeInst
}
public CallSite bootstrap(Class cl) throws ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
ClassLoader bootstrapCL = cl.getClassLoader();
ClassLoader classLoader = cl.getClassLoader();
ClassLoader bootstrapCL = classLoader;
Class<?> bootstrapClass = Class.forName(getBootstrap().methodClass().replace('/', '.'), false, bootstrapCL);
MethodType bt = MethodType.fromMethodDescriptorString(bootstrap.methodType(), bootstrapCL);
MethodType bt = makeMethodType( bootstrapCL, bootstrap.methodType());
Method bootstrap = bootstrapClass.getMethod(this.bootstrap.methodName(), bt.parameterList().toArray(new Class[ bt.parameterCount() ]));
Object[] args = new Object[ bt.parameterCount() ];
@ -164,17 +165,30 @@ public class InvokeDynamicInstruction extends Instruction implements IInvokeInst
impl_lookup.setAccessible(true); // set it accessible
Lookup lutrusted = (Lookup) impl_lookup.get(myLookup); // get the value of IMPL_LOOKUP from the Lookup instance and save it in a new Lookup object
args[0] = lutrusted;
args[1] = getMethodName();
args[2] = MethodType.fromMethodDescriptorString(getMethodSignature(), cl.getClassLoader());
args[2] = makeMethodType(classLoader, getMethodSignature());
for(int i = 3; i < bt.parameterCount(); i++) {
args[i] = getBootstrap().callArgument(bootstrapCL,i-3);
}
//bootstrap.setAccessible(true);
bootstrap.setAccessible(true);
System.err.println(cl + " : " + bootstrap);
return (CallSite) bootstrap.invoke(null, args);
}
public static MethodType makeMethodType(ClassLoader classLoader, String descriptor) throws ClassNotFoundException {
String returnType = Util.makeClass(Util.getReturnType(descriptor));
Class returnClass = Class.forName(returnType, false, classLoader);
String[] paramTypes = Util.getParamsTypes(null, descriptor);
Class[] paramClasses = new Class[ paramTypes.length ];
for(int i = 0; i < paramTypes.length; i++) {
paramClasses[i] = Class.forName(Util.makeClass(paramTypes[i]), false, classLoader);
}
MethodType mt = MethodType.methodType(returnClass, paramClasses);
return mt;
}
static InvokeDynamicInstruction make(ConstantPoolReader cp, int index, int mode) {
if (mode != OP_invokedynamic) {

9
com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java
View File

@ -11,6 +11,7 @@
package com.ibm.wala.shrikeBT.shrikeCT.tools;
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@ -50,9 +51,11 @@ public class BootstrapDumper {
URL[] urls = new URL[ classpathEntries.length-1 ];
for(int i = 1; i < classpathEntries.length; i++) {
System.err.println(classpathEntries[i]);
urls[i-1] = new URL(classpathEntries[i]);
File f = new File(classpathEntries[i]);
assert f.exists();
urls[i-1] = f.toURI().toURL();
}
URLClassLoader image = new URLClassLoader(urls, BootstrapDumper.class.getClassLoader().getParent());
URLClassLoader image = URLClassLoader.newInstance(urls, BootstrapDumper.class.getClassLoader().getParent());
System.err.println(image);
@ -122,7 +125,7 @@ public class BootstrapDumper {
for (int i = 0; i < methodCount; i++) {
cr.initMethodAttributeIterator(i, attrs);
dumpAttributes(Class.forName(cr.getName(), false, image), cr, i, attrs);
dumpAttributes(Class.forName(cr.getName().replace('/', '.'), false, image), cr, i, attrs);
}
}
}

4
com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java
View File

@ -119,7 +119,7 @@ public class BootstrapMethodsReader extends AttributeReader {
return cp.getCPLong(index);
case ClassConstants.CONSTANT_MethodHandle:
String className = cp.getCPHandleClass(index);
Class<?> cls = Class.forName(className, false, cl);
Class<?> cls = Class.forName(className.replace('/', '.'), false, cl);
String eltName = cp.getCPHandleName(index);
String eltDesc = cp.getCPHandleType(index);
MethodType type = MethodType.fromMethodDescriptorString(eltDesc, cl);
@ -128,7 +128,7 @@ public class BootstrapMethodsReader extends AttributeReader {
m.setAccessible(true);
return lk.unreflect(m);
case ClassConstants.CONSTANT_MethodType:
return MethodType.fromMethodDescriptorString(cp.getCPMethodType(index), this.getClass().getClassLoader());
return MethodType.fromMethodDescriptorString(cp.getCPMethodType(index), cl);
default:
assert false : "invalid type " + t;
}

2
com.ibm.wala.tests-feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.ibm.wala.tests-feature"
label="%featureName"
version="1.3.7"
version="1.3.8.qualifier"
provider-name="%providerName">
<plugin

2
com.ibm.wala.tests-feature/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.tests-feature</artifactId>
<packaging>eclipse-feature</packaging>

2
com.ibm.wala.tests.ide-feature/feature.xml
View File

@ -2,7 +2,7 @@
<feature
id="com.ibm.wala.tests.ide"
label="%featureName"
version="1.3.7"
version="1.3.8.qualifier"
provider-name="%providerName">
<plugin

2
com.ibm.wala.util/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: WALA Util
Bundle-SymbolicName: com.ibm.wala.util
Bundle-Version: 1.3.7
Bundle-Version: 1.3.8.qualifier
Export-Package: com.ibm.wala.dataflow.graph,
com.ibm.wala.fixedpoint.impl,
com.ibm.wala.fixpoint,

2
com.ibm.wala.util/mvncentral.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.wala</groupId>
<artifactId>com.ibm.wala.util</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
<packaging>jar</packaging>
<name>WALA utilities</name>
<description>Utility library included with the T. J. Watson

2
com.ibm.wala.util/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>WALA</artifactId>
<groupId>com.ibm.wala</groupId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>com.ibm.wala.util</artifactId>
<packaging>eclipse-plugin</packaging>

9
pom.xml
View File

@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<project-version>1.3.7</project-version>
<project-version>1.3.8-SNAPSHOT</project-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<build-alias>b000</build-alias>
<tycho-version>0.19.0</tycho-version>
<tycho-version>0.21.0</tycho-version>
<tycho.scmUrl>scm:git:ssh://github.com:wala/WALA.git</tycho.scmUrl>
</properties>
@ -55,7 +55,8 @@
<module>com.ibm.wala.scandroid</module>
<module>com.ibm.wala.cast.java.polyglot</module>
<module>com.ibm.wala.cast.java.polyglot.test</module>
<!-- figure out why this dies -->
<!-- module>com.ibm.wala.cast.java.polyglot.test</module -->
<module>com.ibm.wala-repository</module>

2
targets/e42/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala.target</groupId>
<artifactId>targets</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>e42</artifactId>
<packaging>eclipse-target-definition</packaging>

2
targets/e44/e44.target
View File

@ -14,5 +14,5 @@
<repository location="http://download.eclipse.org/releases/luna"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
</target>

2
targets/e44/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.ibm.wala.target</groupId>
<artifactId>targets</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<artifactId>e44</artifactId>
<packaging>eclipse-target-definition</packaging>

4
targets/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<groupId>com.ibm.wala</groupId>
<artifactId>WALA</artifactId>
<version>1.3.7</version>
<version>1.3.8-SNAPSHOT</version>
</parent>
<groupId>com.ibm.wala.target</groupId>
<artifactId>targets</artifactId>
<packaging>pom</packaging>
<modules>
<module>e42</module>
<!-- module>e42</module -->
<module>e44</module>
</modules>
</project>