Skip to content
Permalink
Browse files

Merged core into cctld branch

  • Loading branch information...
Sharon Jonnalagadda
Sharon Jonnalagadda committed Feb 14, 2013
1 parent 9b4f25e commit ea58bf2966abeb3956cd92dadf30624098e4cde4
Showing 627 changed files with 100,040 additions and 3,155 deletions.
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" path="src/main/config"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" path="src/main/config"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,3 +1,5 @@
/java/target
/java/.idea/
/java/arjtk.iml
.gradle
.idea
*.iml
build
target
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tk2_java</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tk2_java</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -25,8 +25,6 @@ A. Software Requirements
------------------------

1. Java SE 6 (jdk1.6) or later - jdk is needed if using source release.
2. Apache Ant 1.7.0 or later
3. JUnit 4.8.2 (included with Toolkit release as junit-4.8.2.jar)

Notes
1. The keytool examples provided in section D are based on the keytool
@@ -47,21 +45,21 @@ Java HotSpot(TM) 64-Bit Server VM (build 20.6-b01, mixed mode)
2. Unpack the toolkit source:
> jar xvf jtk2_release.jar

3. The toolkit jar file can be built from the source or obtained from the lib
3. The toolkit jar file can be built from the source or obtained from the 'artifacts'
directory as a Java archive(arjtk.jar)

If a fresh jar file is required use these additional steps:

4. Build the Java Toolkit class library and all required buildable resources:
> ant [deploy]
> gradlew build

5. The previous command will leave build artifacts in the 'target' directory.
In particular, the target/lib directory will contain the toolkit Java archive
5. The previous command will leave build artifacts in the 'build' directory.
In particular, the build/libs directory will contain the toolkit Java archive
(arjtk.jar).

Notes
Use 'ant -p' to list all available project targets.
The 'tests' target can be used to verify successful installation (more below).
Use 'gradlew tasks' to list all available project targets.
Use 'gradlew test' target to verify successful installation (more below).


C. Usage Information and Advice
@@ -77,15 +75,14 @@ C. Usage Information and Advice

2. The system property java.util.logging.config.file must be set to the
location of the logging.properties file which controls logging behaviour. A
sample logging.properties file is in the target directory (after running
'ant').
sample logging.properties file is in the 'src/main/config' directory.

3. Toolkit behaviour is controlled by a properties file, which by default is
named toolkit.properties. A sample properties file is provided in
target/toolkit.properties (after running 'ant').
'src/main/config/toolkit.properties'.

4. XML schema definition files are bundled in the arjtk.jar archive. The
source for these can be found in src/resources/
source for these can be found in src/main/resources/

5. Authentication files are used by the TLS implementation and are required by
the toolkit in order to function correctly. Please follow through section D
@@ -179,16 +176,16 @@ $ cp site.properties $SITE_CLASSPATH/$SITE_PROPS_FILE
set appropriately, as illustrated in the above examples.

8. Run the supplied tests (will build the Toolkit library if not already built).
$ ant tests
$ gradlew test

9. Verify the results of the test run. If the test run is successful, then the
message 'Build completed successfully' will be displayed, otherwise each failed
test will be reported to the screen. Failure details are available in the
target/test_reports directory. Log messages are written to the system
build/reports/tests/index.html file. Log messages are written to the system
temporary directory, usually /tmp on unix-based systems. Only the messages
from the last test class are available after the test run completes. To
restrict the logging output, modify the logging.properties file in the
target/config directory - a recommended change is to set .level=WARNING
restrict the logging output, modify the logging.properties - a recommended
change is to set .level=WARNING

If the tests passed, congratulations! You have successfully configured the
dependencies of the toolkit. The next step is to consult the user manual,
File renamed without changes.
Binary file not shown.
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation=""
module="arjtk-cctld"
revision="3.0.0.0"
status="integration"
publication="20130214164822"
/>
<configurations>
<conf name="archives" visibility="public" description="Configuration for archive artifacts."/>
<conf name="compile" visibility="private" description="Classpath for compiling the main sources."/>
<conf name="default" visibility="public" description="Configuration for default artifacts." extends="runtime"/>
<conf name="runtime" visibility="private" description="Classpath for running the compiled main classes." extends="compile"/>
<conf name="testCompile" visibility="private" description="Classpath for compiling the test sources." extends="compile"/>
<conf name="testRuntime" visibility="private" description="Classpath for running the compiled test classes." extends="runtime,testCompile"/>
</configurations>
<publications>
<artifact name="arjtk-cctld" type="jar" ext="jar" conf="archives,runtime"/>
</publications>
<dependencies>
<dependency org="junit" name="junit" rev="4.8.2" conf="testCompile->default"/>
</dependencies>
</ivy-module>
@@ -0,0 +1,57 @@
apply plugin: 'java'
apply plugin: 'maven'

ext {
junitVersion = '4.8.2'
artifactsDir = "$projectDir/artifacts"
artifactGroupId = 'au.com.ausregistry'
}

sourceCompatibility = 1.6
version = toolkitVersion

repositories {
maven {
url 'http://nexus.office:8081/nexus/content/repositories/inhouse/'
}
maven {
url 'http://nexus.office:8081/nexus/content/repositories/central/'
}
}

dependencies {
testCompile "junit:junit:$junitVersion"
}

test {
outputs.upToDateWhen { false }
exclude '**/PerfTest.class'
exclude '**/SessionTest.class'
exclude '**/SessionManagerTest.class'
}

javadoc {
destinationDir = file("$projectDir/docs/javadoc")
}

test.dependsOn jar

uploadArchives.dependsOn javadoc

uploadArchives {
repositories {
flatDir {
dirs artifactsDir
}
if (System.properties.keySet().containsAll('repoUrl', 'repoUsername', 'repoPassword')) {
mavenDeployer {
repository(url: System.properties['repoUrl']) {
authentication(userName: System.properties['repoUsername'], password: System.properties['repoPassword'])
}
pom.groupId = artifactGroupId
pom.artifactId = rootProject.name
pom.version = toolkitVersion
}
}
}
}
Oops, something went wrong.

0 comments on commit ea58bf2

Please sign in to comment.
You can’t perform that action at this time.