Author: vjrj_ Date: 2012-04-11 06:24:26 +0200 (Wed, 11 Apr 2012) New Revision: 1839 Modified: trunk/TODO trunk/debian/changelog trunk/pom.xml trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java Log: Removed some compile errors with javac (not with eclipse) Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/TODO 2012-04-11 04:24:26 UTC (rev 1839) @@ -99,6 +99,14 @@ | New folder | | | | | |------------+--------+---------+---------+-----------| +** mvn compile fails depending of java version while compiles in eclipse: +http://stackoverflow.com/a/2858811 +http://jenkins.361315.n4.nabble.com/jenkins-maven-build-requires-specific-jd... +http://maven.40175.n5.nabble.com/Freaking-out-javac-works-maven-compiler-plu... +https://bugs.eclipse.org/bugs/show_bug.cgi?id=340506 +https://bugs.eclipse.org/bugs/show_bug.cgi?id=333011 +http://stackoverflow.com/questions/5633424/is-it-a-eclipse-or-maven-compiler... +https://www.google.com/search?client=ubuntu&channel=fs&q=incompatible+types+... ** setui/root/port 80 [ ] http://wiki.eclipse.org/Jetty/Howto/Port80#Configuring_Jetty.27s_SetUID_Feat... [ ] https://github.com/disconnect/apache-websocket Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/debian/changelog 2012-04-11 04:24:26 UTC (rev 1839) @@ -1,3 +1,9 @@ +kune (0.1.0+b11) unstable; urgency=low + + * Removed some compile errors with javac (not with eclipse) + + -- Vicente J. Ruiz Jurado <[email protected]> Wed, 11 Apr 2012 06:21:37 +0200 + kune (0.1.0+b10) unstable; urgency=low * #tutorial hash, tutorial close, subviews (in the future for content Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/pom.xml 2012-04-11 04:24:26 UTC (rev 1839) @@ -724,6 +724,12 @@ <!-- <artifactId>jetty-continuation</artifactId> --> <!-- <version>${jetty.version}</version> --> <!-- </dependency> --> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.2.2</version> + <type>maven-plugin</type> + </dependency> </dependencies> <distributionManagement> <repository> @@ -753,6 +759,7 @@ </developers> <scm> <url>svn://scm.ourproject.org/svnroot/kune/trunk</url> + <connection>scm:svn:http://scm.ourproject.org/svnroot/kune/trunk</connection> </scm> <build> <plugins> Modified: trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/auth/Authorizated.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -39,15 +39,17 @@ @BindingAnnotation @Retention(RetentionPolicy.RUNTIME) public @interface Authorizated { + // Why full package? + // http://code.google.com/p/projectlombok/issues/detail?id=121 - AccessRol accessRolRequired() default AccessRol.Viewer; + AccessRol accessRolRequired() default cc.kune.core.shared.domain.AccessRol.Viewer; /** * If the action is over a "group", "tool", "container" or over the content. * * @return */ - ActionLevel actionLevel() default ActionLevel.content; + ActionLevel actionLevel() default cc.kune.core.server.auth.ActionLevel.content; boolean mustCheckMembership() default true; Modified: trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/persist/KuneTransactional.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -44,5 +44,5 @@ * A list of exceptions to rollback on, if thrown by the transactional method. * These exceptions are propagated correctly after a rollback. */ - Class<? extends Exception>[] rollbackOn() default RuntimeException.class; + Class<? extends Exception>[] rollbackOn() default java.lang.RuntimeException.class; } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java 2012-04-11 03:09:21 UTC (rev 1838) +++ trunk/src/main/java/cc/kune/core/server/rack/filters/rest/REST.java 2012-04-11 04:24:26 UTC (rev 1839) @@ -27,7 +27,9 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface REST { - String format() default RESTMethod.FORMAT_JSON; + // Why full package? + // http://code.google.com/p/projectlombok/issues/detail?id=121 + String format() default cc.kune.core.server.rack.filters.rest.RESTMethod.FORMAT_JSON; - String[] params(); + String[] params(); }