Skip to content

Commit 330d4e4

Browse files
bahellmabahellma
committed
[changed] removed installation scripts for Sun XACML implementation; now irond comes with a local Maven repository that installs automatically before compiling irond (see README.md for details)
1 parent 59195d9 commit 330d4e4

17 files changed

+77
-28
lines changed

‎src/main/templates/lib/license.txt ‎LICENSE.SUNXACML.txt

File renamed without changes.

‎README.SUNXACML.txt

-12
This file was deleted.

‎README.md

+15-7
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,10 @@ However, if an entry exists, but is set to any other value then `ro` or
7979

8080
Building
8181
========
82-
Before executing Maven commands you have to install unmanaged dependencies
83-
in your local Maven repository. After running
84-
85-
$ ./mvn-install-sunxacml.sh
86-
87-
in `src/main/templates/installation` you should be ready to run
88-
82+
Just run
8983
$ mvn package
84+
as Maven will install the dependency to the [SunXACML implementation][5] on its own before
85+
compiling.
9086

9187

9288
Running
@@ -128,7 +124,19 @@ LICENSE
128124
irond is licensed under the [Apache License, Version 2.0][3].
129125

130126

127+
Notes on Sun XACML
128+
==================
129+
The original Sun XACML implementation in version `2.0-M2-SNAPSHOT` was changed to not
130+
include an own log4j properties file.
131+
The altered jar-file was then handled by a Python script by [Nikita Volkov][6] to
132+
generate a local Maven repository for irond.
133+
It installs in the users Maven repository (~/.m2/repository) as `net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/`.
134+
The license of the original Sun XACML implementation is attached as `LICENSE.SUNXACML.txt`.
135+
136+
131137
[1]: http://www.trustedcomputinggroup.org/files/static_page_files/FF3CB868-1A4B-B294-D093D8383D733B8A/TNC_IFMAP_v2_2r9.pdf
132138
[2]: http://download.oracle.com/javase/6/docs/technotes/tools/windows/keytool.html
133139
[3]: http://www.apache.org/licenses/LICENSE-2.0.html
134140
[4]: https://github.com/trustathsh/irond/releases
141+
[5]: http://sourceforge.net/projects/sunxacml/files/maven/snapshots/net/sf/sunxacml/sunxacml/2.0-M2-SNAPSHOT/
142+
[6]: https://github.com/nikita-volkov/install-to-project-repo

‎pom.xml

+10-2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@
135135

136136
<sourceDirectory>target/filtered-source/java</sourceDirectory>
137137
</build>
138+
139+
<repositories>
140+
<repository>
141+
<id>project</id>
142+
<url>${project.baseUri}/repository</url>
143+
</repository>
144+
</repositories>
145+
138146
<dependencies>
139147
<dependency>
140148
<groupId>log4j</groupId>
@@ -161,9 +169,9 @@
161169
<version>1.5</version>
162170
</dependency>
163171
<dependency>
164-
<groupId>sunxacml</groupId>
172+
<groupId>net.sf.sunxacml</groupId>
165173
<artifactId>sunxacml</artifactId>
166-
<version>2.0-M2</version>
174+
<version>2.0-M2.trustathsh-SNAPSHOT</version>
167175
</dependency>
168176
</dependencies>
169177
</project>

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/maven-metadata-local.xml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata modelVersion="1.1.0">
3+
<groupId>net.sf.sunxacml</groupId>
4+
<artifactId>sunxacml</artifactId>
5+
<version>2.0-M2.trustathsh-SNAPSHOT</version>
6+
<versioning>
7+
<snapshot>
8+
<localCopy>true</localCopy>
9+
</snapshot>
10+
<lastUpdated>20140904140026</lastUpdated>
11+
<snapshotVersions>
12+
<snapshotVersion>
13+
<extension>jar</extension>
14+
<value>2.0-M2.trustathsh-SNAPSHOT</value>
15+
<updated>20140904140026</updated>
16+
</snapshotVersion>
17+
<snapshotVersion>
18+
<extension>pom</extension>
19+
<value>2.0-M2.trustathsh-SNAPSHOT</value>
20+
<updated>20140904140026</updated>
21+
</snapshotVersion>
22+
</snapshotVersions>
23+
</versioning>
24+
</metadata>

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/maven-metadata-local.xml.md5

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3ebeff3aab1fdfe761b61dd4c92ccfdb

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/maven-metadata-local.xml.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3b1bb9836b57ab65a028da446505454a5cc0ecad

‎src/main/templates/lib/sunxacml-2.0-M2-SNAPSHOT.jar ‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.jar

File renamed without changes.

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.jar.md5

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cfc648f3113f61b2477ee2a01d37bcec

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7d8dc0b42a0ebc220d7fe94e197275ac4428046e

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.pom

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>net.sf.sunxacml</groupId>
6+
<artifactId>sunxacml</artifactId>
7+
<version>2.0-M2.trustathsh-SNAPSHOT</version>
8+
<description>POM was created from install:install-file</description>
9+
</project>

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.pom.md5

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
39c027606b0d96f4fdd6f7233beb81bb

‎repository/net/sf/sunxacml/sunxacml/2.0-M2.trustathsh-SNAPSHOT/sunxacml-2.0-M2.trustathsh-SNAPSHOT.pom.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
30f82b11fa5680906fb3dd56960d4f7d135aca3d

‎repository/net/sf/sunxacml/sunxacml/maven-metadata-local.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata>
3+
<groupId>net.sf.sunxacml</groupId>
4+
<artifactId>sunxacml</artifactId>
5+
<versioning>
6+
<versions>
7+
<version>2.0-M2.trustathsh-SNAPSHOT</version>
8+
</versions>
9+
<lastUpdated>20140904140026</lastUpdated>
10+
</versioning>
11+
</metadata>

‎repository/net/sf/sunxacml/sunxacml/maven-metadata-local.xml.md5

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2bd2043f624de7f1b6d01290c6294523

‎repository/net/sf/sunxacml/sunxacml/maven-metadata-local.xml.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
523afdab568602ac602a930faf99e7ebe2cb569b

‎src/main/templates/installation/mvn-install-sunxacml.sh

-7
This file was deleted.

0 commit comments

Comments
 (0)