OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | fractal-commits List | August 2008 Index

<--  Date Index  --> <--  Thread Index  -->

[fractal-commits] [8416] trunk/juliac: Merge genericparameter and innertypeparameter into proxyparameters.


Title: [8416] trunk/juliac: Merge genericparameter and innertypeparameter into proxyparameters.
Revision
8416
Author
seintur
Date
2008-08-29 17:47:39 +0200 (Fri, 29 Aug 2008)

Log Message

Merge genericparameter and innertypeparameter into proxyparameters.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/juliac/TODO.txt (8415 => 8416)


--- trunk/juliac/TODO.txt	2008-08-29 14:54:37 UTC (rev 8415)
+++ trunk/juliac/TODO.txt	2008-08-29 15:47:39 UTC (rev 8416)
@@ -15,7 +15,6 @@
 * provide a pre-mixed version of the membranes defined by Dream
 
 examples/advanced/foobar-cases/
-* merge genericparameter and innertypeparameter into proxyparameters
 * add a srcinjar example (first check with some code which produces compile time
   errors -> relation with the bug reporter by S\xE9bastien?)
 * add an absolutepath example which invokes a main() which copies sources in the

Modified: trunk/juliac/examples/advanced/foobar-cases/pom.xml (8415 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/pom.xml	2008-08-29 14:54:37 UTC (rev 8415)
+++ trunk/juliac/examples/advanced/foobar-cases/pom.xml	2008-08-29 15:47:39 UTC (rev 8416)
@@ -14,9 +14,8 @@
     <name>Juliac advanced foobar-cases examples</name>
 
 	<modules>
-		<module>genericparameter</module>
-		<module>innertypeparameter</module>
 		<module>otherversionnumber</module>
+		<module>proxyparameters</module>
 	</modules>
 
 </project>

Copied: trunk/juliac/examples/advanced/foobar-cases/proxyparameters (from rev 8398, trunk/juliac/examples/advanced/foobar-cases/genericparameter)

Property changes: trunk/juliac/examples/advanced/foobar-cases/proxyparameters


Name: svn:ignore
   + target
.classpath
.project
Name: svn:mergeinfo
   + 

Modified: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/README.txt (8398 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/genericparameter/README.txt	2008-08-26 20:05:16 UTC (rev 8398)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/README.txt	2008-08-29 15:47:39 UTC (rev 8416)
@@ -1,2 +1,9 @@
-Test whether generic types used as parameters in interfaces are handled
-correctly.
+Test various issues related with handling parameters when generating proxy
+classes.
+
+* inner types: check that inner types are generated as outter.inner (which is
+  the source code syntax) and not as outter$inner (which the binary form) which
+  was the case prior to Juliac 2.0.1.
+
+* generic types: check that generic types are taken into account when generating
+  proxy classes which was not the case prior to Juliac 2.1.

Deleted: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/pom.xml (8398 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/genericparameter/pom.xml	2008-08-26 20:05:16 UTC (rev 8398)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/pom.xml	2008-08-29 15:47:39 UTC (rev 8416)
@@ -1,61 +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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.objectweb.fractal.juliac</groupId>
-		<artifactId>juliac-parent</artifactId>
-		<version>2.1-SNAPSHOT</version>
-	</parent>
-
-    <groupId>org.objectweb.fractal.juliac.examples</groupId>
-    <artifactId>genericparameter</artifactId>
-    <packaging>jar</packaging>
-    <name>Generic parameter example</name>
- 
-    <build>
-        <plugins>
-			<!-- ==================================== -->
-			<!-- Generate and compile the application -->
-			<!-- ==================================== -->
-			<plugin>
-				<groupId>org.objectweb.fractal.juliac</groupId>
-				<artifactId>maven-juliac-plugin</artifactId>
-				<version>${project.version}</version>
-				<executions>
-					<execution>
-						<id>juliac-compile</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>compile</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<opt>OO</opt>
-					<srcs><src>src/main/java</src></srcs>
-					<mixins>
-						<mixin>org.objectweb.fractal.julia:julia-mixins:${julia.version}:sources</mixin>
-					</mixins>
-					<components>
-						<component>
-							<interfaceTypes>
-								<interfaceType>
-									<name>i</name>
-									<signature>example.genericparameter.I</signature>
-									<isClient>false</isClient>
-									<isOptional>false</isOptional>
-									<isCollection>false</isCollection>
-								</interfaceType>
-							</interfaceTypes>
-							<controllerDesc>primitive</controllerDesc>
-							<contentDesc>example.genericparameter.CImpl</contentDesc>
-						</component>
-					</components>
-					<!-- debug>true</debug -->
-				</configuration>
-			</plugin>
-		</plugins>
-    </build>
-
-</project>

Copied: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/pom.xml (from rev 8400, trunk/juliac/examples/advanced/foobar-cases/genericparameter/pom.xml) (0 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/proxyparameters/pom.xml	                        (rev 0)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/pom.xml	2008-08-29 15:47:39 UTC (rev 8416)
@@ -0,0 +1,81 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.objectweb.fractal.juliac</groupId>
+		<artifactId>juliac-parent</artifactId>
+		<version>2.1-SNAPSHOT</version>
+	</parent>
+
+    <groupId>org.objectweb.fractal.juliac.examples</groupId>
+    <artifactId>genericparameter</artifactId>
+    <packaging>jar</packaging>
+    <name>Proxy parameters example</name>
+ 
+    <build>
+        <plugins>
+			<!-- ==================================== -->
+			<!-- Generate and compile the application -->
+			<!-- ==================================== -->
+			<plugin>
+				<groupId>org.objectweb.fractal.juliac</groupId>
+				<artifactId>maven-juliac-plugin</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<id>juliac-compile</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<opt>OO</opt>
+					<srcs><src>src/main/java</src></srcs>
+					<mixins>
+						<mixin>org.objectweb.fractal.julia:julia-mixins:${julia.version}:sources</mixin>
+					</mixins>
+					<components>
+
+					<!-- ========================================= -->
+					<!-- Test blanck spaces (space, tab, newlines) -->
+					<!-- in parameters                             -->
+					<!-- ========================================= -->
+					
+						<component>
+							<interfaceTypes>
+								<interfaceType>
+			<name>
+		  i
+			</name>
+			<signature>
+		  example.genericparameter.I
+			</signature>
+			<isClient>
+		  false
+			</isClient>
+			<isOptional>
+		  false
+			</isOptional>
+			<isCollection>
+		  false
+			</isCollection>
+								</interfaceType>
+							</interfaceTypes>
+							<controllerDesc>
+		  primitive
+							</controllerDesc>
+							<contentDesc>
+		  example.genericparameter.CImpl
+							</contentDesc>
+						</component>
+					</components>
+					<!-- debug>true</debug -->
+				</configuration>
+			</plugin>
+		</plugins>
+    </build>
+
+</project>

Copied: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters (from rev 8398, trunk/juliac/examples/advanced/foobar-cases/genericparameter/src/main/java/example/genericparameter)

Property changes: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters


Name: svn:mergeinfo
   + 

Modified: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/CImpl.java (8398 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/genericparameter/src/main/java/example/genericparameter/CImpl.java	2008-08-26 20:05:16 UTC (rev 8398)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/CImpl.java	2008-08-29 15:47:39 UTC (rev 8416)
@@ -1,4 +1,4 @@
-package example.genericparameter;
+package example.proxyparameters;
 
 import java.io.Serializable;
 import java.util.Collection;

Modified: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/I.java (8398 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/genericparameter/src/main/java/example/genericparameter/I.java	2008-08-26 20:05:16 UTC (rev 8398)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/I.java	2008-08-29 15:47:39 UTC (rev 8416)
@@ -1,4 +1,4 @@
-package example.genericparameter;
+package example.proxyparameters;
 
 import java.io.Serializable;
 import java.util.Collection;

Modified: trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/J.java (8398 => 8416)


--- trunk/juliac/examples/advanced/foobar-cases/genericparameter/src/main/java/example/genericparameter/J.java	2008-08-26 20:05:16 UTC (rev 8398)
+++ trunk/juliac/examples/advanced/foobar-cases/proxyparameters/src/main/java/example/proxyparameters/J.java	2008-08-29 15:47:39 UTC (rev 8416)
@@ -1,4 +1,4 @@
-package example.genericparameter;
+package example.proxyparameters;
 
 public interface J<B> {
     


<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.