Skip to content

Commit cb31c9c

Browse files
committed
Cleaning up for the next release.
1 parent 9c9c164 commit cb31c9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+210
-1147
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/err
2+
/std

.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>j2b</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
</buildSpec>
9+
<natures>
10+
</natures>
11+
</projectDescription>

ant/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target/
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding/<project>=UTF-8
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=1.6
6+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
12+
org.eclipse.jdt.core.compiler.source=1.6
Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
11
package org.jvnet.jaxb2_commons.xjc;
22

3-
import java.io.File;
4-
import java.lang.reflect.Field;
5-
63
import org.apache.tools.ant.BuildException;
7-
import org.apache.tools.ant.types.Path;
84

95
public class XJC2Task extends com.sun.tools.xjc.XJC2Task {
106

11-
@Override
12-
public void execute() throws BuildException {
7+
private boolean disableXmlSecurity = true;
138

14-
hack();
15-
super.execute();
9+
public void setDisableXmlSecurity(boolean disableXmlSecurity) {
10+
this.disableXmlSecurity = disableXmlSecurity;
1611
}
1712

18-
protected void hack() {
19-
try {
20-
final Field declaredField = getClass().getSuperclass()
21-
.getDeclaredField("classpath");
22-
declaredField.setAccessible(true);
23-
final Path path = (Path) declaredField.get(this);
24-
if (path != null) {
25-
for (String pathElement : path.list()) {
26-
options.classpaths.add(new File(pathElement).toURI()
27-
.toURL());
28-
}
29-
}
30-
} catch (Exception ex) {
31-
throw new BuildException(ex);
13+
private String accessExternalSchema = "all";
14+
15+
public void setAccessExternalSchema(String accessExternalSchema) {
16+
this.accessExternalSchema = accessExternalSchema;
17+
}
18+
19+
private String accessExternalDTD = "all";
20+
21+
public void setAccessExternalDTD(String accessExternalDTD) {
22+
this.accessExternalDTD = accessExternalDTD;
23+
}
24+
25+
@Override
26+
public void execute() throws BuildException {
27+
this.options.disableXmlSecurity = this.disableXmlSecurity;
28+
if (accessExternalSchema != null) {
29+
System.setProperty("javax.xml.accessExternalSchema",
30+
accessExternalSchema);
3231
}
32+
if (accessExternalDTD != null) {
33+
System.setProperty("javax.xml.accessExternalDTD", accessExternalDTD);
34+
}
35+
super.execute();
3336
}
37+
3438
}

basic/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target/
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
6+
encoding/<project>=UTF-8
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.6

dist/pom.xml

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)