azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hello.namespace -> hello.HelloPackage

Browse Source
This commit is contained in:
Andrey Breslav
2013-03-01 13:14:06 +04:00
parent a887175f1a
commit 89017fbc89
4 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/maven/hello-world/pom.xml
+95 -95
View File
@@ -1,95 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project <project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin.examples</groupId> <groupId>org.jetbrains.kotlin.examples</groupId>
<artifactId>hello-world</artifactId> <artifactId>hello-world</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<properties> <properties>
<kotlin.version>0.1-SNAPSHOT</kotlin.version> <kotlin.version>0.1-SNAPSHOT</kotlin.version>
<junit.version>4.10</junit.version> <junit.version>4.10</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory> <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory> <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration/> <configuration/>
<executions> <executions>
<execution> <execution>
<id>compile</id> <id>compile</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
<phase>test-compile</phase> <phase>test-compile</phase>
<goals> <goals>
<goal>test-compile</goal> <goal>test-compile</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version> <version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>java</goal> <goal>java</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<mainClass>hello.namespace</mainClass> <mainClass>hello.HelloPackage</mainClass>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>jetbrains-all</id> <id>jetbrains-all</id>
<url>http://repository.jetbrains.com/all</url> <url>http://repository.jetbrains.com/all</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>jetbrains-all</id> <id>jetbrains-all</id>
<url>http://repository.jetbrains.com/all</url> <url>http://repository.jetbrains.com/all</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>
examples/maven/mixed-code-hello-world/pom.xml
+76 -76
View File
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project <project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin.examples</groupId> <groupId>org.jetbrains.kotlin.examples</groupId>
<artifactId>mixed-code-hello-world</artifactId> <artifactId>mixed-code-hello-world</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<properties> <properties>
<kotlin.version>0.1-SNAPSHOT</kotlin.version> <kotlin.version>0.1-SNAPSHOT</kotlin.version>
<junit.version>4.10</junit.version> <junit.version>4.10</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration/> <configuration/>
<executions> <executions>
<execution> <execution>
<id>compile</id> <id>compile</id>
<phase>process-sources</phase> <phase>process-sources</phase>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
</execution> </execution>
<execution> <execution>
<id>test-compile</id> <id>test-compile</id>
<phase>process-test-sources</phase> <phase>process-test-sources</phase>
<goals> <goals>
<goal>test-compile</goal> <goal>test-compile</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>jetbrains-all</id> <id>jetbrains-all</id>
<url>http://repository.jetbrains.com/all</url> <url>http://repository.jetbrains.com/all</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>jetbrains-all</id> <id>jetbrains-all</id>
<url>http://repository.jetbrains.com/all</url> <url>http://repository.jetbrains.com/all</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
</project> </project>
examples/maven/mixed-code-hello-world/src/main/java/hello/JavaHello.java
+2 -2
View File
@@ -4,11 +4,11 @@ public class JavaHello {
public static String JavaHelloString = "Hello from Java!"; public static String JavaHelloString = "Hello from Java!";
public static String getHelloStringFromKotlin() { public static String getHelloStringFromKotlin() {
return namespace.KotlinHelloString; return HelloPackage.KotlinHelloString;
} }
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(getHelloStringFromKotlin()); System.out.println(getHelloStringFromKotlin());
System.out.println(namespace.getHelloStringFromJava()); System.out.println(HelloPackage.getHelloStringFromJava());
} }
} }
examples/maven/mixed-code-hello-world/src/test/java/hello/tests/HelloTest.java
+2 -2
View File
@@ -6,8 +6,8 @@ import junit.framework.TestCase;
public class HelloTest extends TestCase { public class HelloTest extends TestCase {
public void testAssert() { public void testAssert() {
assertEquals("Hello from Kotlin!", JavaHello.getHelloStringFromKotlin()); assertEquals("Hello from Kotlin!", JavaHello.getHelloStringFromKotlin());
assertEquals("Hello from Java!", hello.namespace.getHelloStringFromJava()); assertEquals("Hello from Java!", hello.HelloPackage.getHelloStringFromJava());
System.out.println(hello.namespace.getHelloStringFromJava()); System.out.println(hello.HelloPackage.getHelloStringFromJava());
} }
} }