Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

7 files changed, 16 insertions, 81 deletions

diff --git a/BKUFonts/.classpath b/BKUFonts/.classpath
deleted file mode 100644
index d2236dff..00000000
--- a/BKUFonts/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/fonts"/>
-	<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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/BKUFonts/.project b/BKUFonts/.project
deleted file mode 100644
index 484ff825..00000000
--- a/BKUFonts/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BKUFonts</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/BKUFonts/.settings/org.eclipse.jdt.core.prefs b/BKUFonts/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9db35b19..00000000
--- a/BKUFonts/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 06 15:23:46 CET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/BKUFonts/.settings/org.eclipse.wst.common.component b/BKUFonts/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d7d79bb4..00000000
--- a/BKUFonts/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="BKUFonts">
-        <wb-resource deploy-path="/" source-path="/src/main/fonts"/>
-    </wb-module>
-</project-modules>
diff --git a/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml b/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index f68988cf..00000000
--- a/BKUFonts/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/BKUFonts/.settings/org.maven.ide.eclipse.prefs b/BKUFonts/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 51d61132..00000000
--- a/BKUFonts/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Nov 06 15:23:22 CET 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/BKUFonts/pom.xml b/BKUFonts/pom.xml
index 6f0b929e..abcb8339 100644
--- a/BKUFonts/pom.xml
+++ b/BKUFonts/pom.xml
@@ -1,22 +1,28 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>bku</artifactId>
+    <artifactId>mocca</artifactId>
     <groupId>at.gv.egiz</groupId>
-    <version>1.2.14-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
   </parent>
   <groupId>at.gv.egiz</groupId>
   <artifactId>BKUFonts</artifactId>
-  <version>1.2</version>
+  <version>${mocca.fonts.version}</version>
   <name>BKU Fonts</name>
   <description>
+    <!--
+     |   ResourceFontLoader needs font resources on runtime classpath.
+     |   Runtime dependency on BKUFonts ensures that transitive dependency
+     |   remains (not true for provided), see BKUViewer, BKULocal and
+     |   BKUOnline -->
+
     This module is used in validator(s) and viewer and is a direct dependency of
-      - BKUViewer (attention, this is the validator!)
-        TextValidator depends on the fonts. (compile scope, make available for BKULocal/Online TextValidator)
-        (TextValidator should rather use a FontProvider)
-      - BKUOnline:
-          - direct/provided if jar inclusion in applet dir, but do not enforce inclusion as WEB-INF/lib
-          - transitive from BKUViewer if unpack-fonts to applet dir
+      - bkucommon (direct runtime dependency)
+      - BKUViewer (transitive runtime from bkucommon)
+        TextValidator depends on the fonts. (TextValidator should rather use a FontProvider)
+      - BKUOnline (transitive runtime from bkucommon/bkuviewer)
+        unpack-fonts to applet dir and include jar in WEB-INF/lib
+      - BKULocal (transitive runtime from bkucommon/bkuviewer)
       - removed the BKUCommonGUI (runtime; propagate dependency to BKUApplet):
           no real dependency: BKUCommonGUI contains SecureFontProvider interface only
           (which does not state how fonts are loaded); implementations should depend no BKUFonts
@@ -38,4 +44,4 @@
       </resource>
     </resources>
   </build>
-</project>
\ No newline at end of file
+</project>