diff --git a/Sda2/Makefile b/Sda2/Makefile index 97e94efa9cd4915b2b84cdff8dd8e52e0ca76b93..557ec7a83b9b038d960f4c7c9653ede70b909e74 100644 --- a/Sda2/Makefile +++ b/Sda2/Makefile @@ -17,12 +17,25 @@ BUILDROOT=/tmp BUILDBASE=$(BUILDROOT)/$(SCRIPTBASENAME) BUILDNAVI=$(BUILDBASE)/navi/$(PLUGINID) BUILDNONAVI=$(BUILDBASE)/nonavi/$(PLUGINID) +JAVADOCDESTDIR=${BUILDNAVI}/Ref/api +POMDIRS= $(shell find P -name pom.xml|grep -v target/classes/META-INF|sed -e s/\\/pom.xml//g) +# +#Rule to build javadoc from pom.xml file +# +%/jdoc : % + mkdir -p ${JAVADOCDESTDIR}/$* + cp -r $* $*_jdoctmp; + cd $*_jdoctmp; mvn javadoc:javadoc; rm -rf ${JAVADOCDESTDIR}/$*/*; mv target/site/apidocs/* ${JAVADOCDESTDIR}/$*; \ + mvn eclipse:myeclipse-clean eclipse:clean clean; \ + rm -rf .settings; \ + zip ${JAVADOCDESTDIR}/$*/eclipse.zip -r * + rm -rf $*_jdoctmp all::${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf -jdoc: +jdoc: $(foreach pomDir,$(POMDIRS),$(pomDir)/jdoc ) cd ../ws/eclipse;javadoc \ -classpath ${HIBDEPS}:${JDBCDEPS} -d ${BUILDNAVI}/Ref/api -linksource \ -link http://docs.oracle.com/javase/8/docs/api/ -link http://testng.org/javadocs/ -link http://docs.oracle.com/javaee/6/api/ \ diff --git a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore b/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore deleted file mode 100644 index a1c3ab4d08c0f9f91918f21c730272a4711885e8..0000000000000000000000000000000000000000 --- a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -/.settings/ -.classpath -.project diff --git a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml b/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml deleted file mode 100644 index 7d82a7c1391932a6fb28404c1cd3f957201cb8f9..0000000000000000000000000000000000000000 --- a/Sda2/P/UnixSqlLdap/Jndi/Rdbms2Ldap/rdbms2ldap/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ -<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> - - <groupId>de.hdm-stuttgart.mi.sda2</groupId> - <artifactId>rdbms2ldap</artifactId> - <version>0.9</version> - <packaging>jar</packaging> - - <name>rdbms2ldap</name> - - <!--Fixme: Add a sensible project related domain here --> - <url>http://somedomain.org</url> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.11</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.33</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/Sda2/sda2.xml b/Sda2/sda2.xml index 09bc1a6e96d5a34327694104cfe3bf27a2d0fcda..9a2d65029c1917ef0dc7546cdfaa46365666238d 100644 --- a/Sda2/sda2.xml +++ b/Sda2/sda2.xml @@ -629,6 +629,16 @@ tty:x:5: </listitem> </orderedlist> </question> + + <answer> + <annotation role="make"> + <para role="eclipse">P/UnixSqlLdap/Jndi/Unix2Rdbms</para> + </annotation> + + <annotation role="make"> + <para role="eclipse">P/UnixSqlLdap/Jndi/Rdbms2Ldap</para> + </annotation> + </answer> </qandaentry> </qandadiv> </qandaset>