You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/03/20 17:43:25 UTC

git commit: o Removed ignored files Moved the fileds on top of the file

Updated Branches:
  refs/heads/trunk e7f3c852c -> f361cbc44


o Removed ignored files
Moved the fileds on top of the file


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/f361cbc4
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/f361cbc4
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/f361cbc4

Branch: refs/heads/trunk
Commit: f361cbc44e6bbb239b60cb0bd9339082d247ec83
Parents: e7f3c85
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Wed Mar 20 17:42:16 2013 +0100
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Wed Mar 20 17:42:16 2013 +0100

----------------------------------------------------------------------
 benchmarks/.classpath                           |   11 ++++++-----
 benchmarks/.project                             |    1 +
 benchmarks/.settings/org.eclipse.jdt.core.prefs |    7 +++++++
 3 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/f361cbc4/benchmarks/.classpath
----------------------------------------------------------------------
diff --git a/benchmarks/.classpath b/benchmarks/.classpath
index fe42b4b..c019140 100644
--- a/benchmarks/.classpath
+++ b/benchmarks/.classpath
@@ -6,20 +6,21 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="src" path="/mina-core"/>
+  <classpathentry kind="src" path="/mina-codec"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar">
     <attributes>
       <attribute value="jar:file:/Users/elecharny/.m2/repository/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/io/netty/netty/3.5.9.Final/netty-3.5.9.Final.jar" sourcepath="M2_REPO/io/netty/netty/3.5.9.Final/netty-3.5.9.Final-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/io/netty/netty/3.6.3.Final/netty-3.6.3.Final.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar">
     <attributes>
-      <attribute value="jar:file:/Users/elecharny/.m2/repository/io/netty/netty/3.5.9.Final/netty-3.5.9.Final-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar" sourcepath="M2_REPO/junit/junit/4.10/junit-4.10-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
     <attributes>
-      <attribute value="jar:file:/Users/elecharny/.m2/repository/junit/junit/4.10/junit-4.10-javadoc.jar!/" name="javadoc_location"/>
+      <attribute value="jar:file:/Users/elecharny/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/>
 </classpath>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/mina/blob/f361cbc4/benchmarks/.project
----------------------------------------------------------------------
diff --git a/benchmarks/.project b/benchmarks/.project
index c1cad89..f745a80 100644
--- a/benchmarks/.project
+++ b/benchmarks/.project
@@ -7,6 +7,7 @@
     transports such as TCP/IP and UDP/IP via Java NIO. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
   <projects>
     <project>mina-core</project>
+    <project>mina-codec</project>
   </projects>
   <buildSpec>
     <buildCommand>

http://git-wip-us.apache.org/repos/asf/mina/blob/f361cbc4/benchmarks/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/benchmarks/.settings/org.eclipse.jdt.core.prefs b/benchmarks/.settings/org.eclipse.jdt.core.prefs
index 996e1e3..04fee92 100644
--- a/benchmarks/.settings/org.eclipse.jdt.core.prefs
+++ b/benchmarks/.settings/org.eclipse.jdt.core.prefs
@@ -3,8 +3,15 @@ encoding/src/main/java=UTF-8
 encoding/src/main/resources=UTF-8
 encoding/src/test/java=UTF-8
 encoding/src/test/resources=UTF-8
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16