harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r391483 - in /incubator/harmony/enhanced/classlib/trunk/modules: crypto/make/common/ security/ security/make/common/ security/src/common/javasrc/java/ security/src/common/javasrc/javax/ security/src/common/javasrc/org/ security/src/linux/ja...
Date Wed, 05 Apr 2006 04:47:34 GMT
Author: mloenko
Date: Tue Apr  4 21:47:31 2006
New Revision: 391483

URL: http://svn.apache.org/viewcvs?rev=391483&view=rev
Log:
fix for HARMONY-147: Reorganise security module layout
Applied mostly all the changes provided by George.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/security/.classpath
    incubator/harmony/enhanced/classlib/trunk/modules/security/.project
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/javax/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/linux/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/linux/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/windows/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/windows/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/javax/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/javax/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/linux/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/linux/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/test/linux/unit/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/windows/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/windows/org/
      - copied from r391473, incubator/harmony/enhanced/classlib/trunk/modules/security/test/windows/unit/org/
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/javax/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/common/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/linux/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/src/windows/javasrc/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/java/
    incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/javax/
    incubator/harmony/enhanced/classlib/trunk/modules/security/test/common/unit/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/test/linux/unit/org/
    incubator/harmony/enhanced/classlib/trunk/modules/security/test/windows/unit/org/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=391483&r1=391482&r2=391483&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Tue Apr
 4 21:47:31 2006
@@ -56,7 +56,7 @@
                     <!-- FIXME: CRYPTO tests should not reach into security module code
-->
                     <src>
                         <pathelement location="${hy.crypto.src.test.java}"/>
-                        <pathelement location="${hy.crypto}/../security/test/common/unit"/>
+                        <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
                     </src>
 
                     <include name="javax/crypto/**/*.java" />

Added: incubator/harmony/enhanced/classlib/trunk/modules/security/.classpath
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/.classpath?rev=391483&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/.classpath (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/.classpath Tue Apr  4 21:47:31
2006
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java/common"/>
+	<classpathentry kind="src" path="src/main/resources/common"/>
+	<classpathentry kind="src" path="src/main/native/linux"/>
+	<classpathentry kind="src" path="src/main/native/win"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/win"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/linux"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/common"/>
+	<classpathentry kind="src" path="src/main/java/linux"/>
+	<classpathentry kind="src" path="src/main/java/win"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="output" path="bin/main"/>
+</classpath>

Added: incubator/harmony/enhanced/classlib/trunk/modules/security/.project
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/.project?rev=391483&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/.project (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/.project Tue Apr  4 21:47:31
2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>security</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=391483&r1=391482&r2=391483&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Tue Apr
 4 21:47:31 2006
@@ -18,10 +18,10 @@
 <project name="Common_Security_Build">
 
 	<property name="hy.security.src.main.java.platform"
-		value="${hy.security.src.main.java}/../../${hy.os_family}/javasrc" />
+		value="${hy.security.src.main.java}/../${hy.os_family}" />
 
 	<property name="hy.security.src.test.java.platform"
-		value="${hy.security.src.test.java}/../../${hy.os_family}/unit" />
+		value="${hy.security.src.test.java}/../${hy.os_family}" />
 	
 	<target name="compile.java" description="Compile SECURITY java code">
 		<echo message="Compiling SECURITY classes from ${hy.security.src.main.java}" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml?rev=391483&r1=391482&r2=391483&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
Tue Apr  4 21:47:31 2006
@@ -19,11 +19,11 @@
    <security location=".">
       <src>
          <main>
-            <java location="src/common/javasrc" />
+            <java location="src/main/java/common" />
         	<resources location="src/main/resources" />
          </main>
          <test>
-            <java location="test/common/unit" />
+            <java location="src/test/java/common" />
             <resources location="src/main/resources" />
          </test>
          <natives location="src/natives" />



Mime
View raw message