Skip to content

Commit

Permalink
Merge branch 'nortal-publish' (Nortal DDS pull request)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rainer Villido authored and Rainer Villido committed Jul 10, 2015
2 parents d54669c + 2385316 commit 4220aad
Show file tree
Hide file tree
Showing 93 changed files with 17,601 additions and 936 deletions.
17 changes: 17 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=digidoc4j_development_codeborne&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="lib" path="lib/dss-common-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/dss-document-4.3.0-RC.jar" sourcepath="/dss-document"/>
<classpathentry kind="lib" path="lib/dss-service-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/dss-spi-4.3.0-RC.jar"/>
<classpathentry kind="lib" path="lib/jacocoagent.jar"/>
<classpathentry kind="lib" path="lib/jacocoant.jar"/>
<classpathentry kind="lib" path="lib/jdigidoc-3.10.1424.BETA.jar"/>
<classpathentry kind="lib" path="lib/testcerts.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
/coverage
/dist
/.idea/workspace.xml
/.idea/uiDesigner.xml

/tmp
/.idea/dictionaries/xp.xml
digidoc4j.iml
*.log

password.properties
copy-dss-jars.sh
/util
token
packaging_jar
lib
/bin
container.bin
createsECCSignature.bdoc
extractSignatureThrowsErrorWhenSignatureIsNotFound.zip
packaging_jar/
setsSignatureId.bdoc
setsSignatureId.ddoc
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "sd-dss"]
path = sd-dss
url = ../sd-dss.git

branch = publish
11 changes: 0 additions & 11 deletions .idea/ant.xml

This file was deleted.

8 changes: 8 additions & 0 deletions .idea/artifacts/dss_demo_webapp_war.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 104 additions & 0 deletions .idea/artifacts/dss_demo_webapp_war_exploded.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions .idea/codeStyleSettings.xml

This file was deleted.

10 changes: 10 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions .idea/dictionaries/ahoa.xml

This file was deleted.

Loading

0 comments on commit 4220aad

Please sign in to comment.