Skip to content

Commit

Permalink
Merge branch 'main' into extractMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
turkeylurkey authored Jul 25, 2023
2 parents 3d5a7fd + 1ce8d54 commit f93571a
Show file tree
Hide file tree
Showing 61 changed files with 1,581 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse LSP4Jakarta Plugin (Incubation)
Bundle-Vendor: Eclipse LSP4Jakarta
Bundle-SymbolicName: org.eclipse.lsp4jakarta.lsp4e.core;singleton:=true
Bundle-Version: 0.1.1.qualifier
Bundle-Version: 0.1.2.qualifier
Bundle-Activator: org.eclipse.lsp4jakarta.lsp4e.Activator
Require-Bundle:
org.eclipse.lsp4e,
Expand Down
4 changes: 2 additions & 2 deletions jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
<groupId>org.eclipse.lsp4jakarta</groupId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e.core</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down Expand Up @@ -46,7 +46,7 @@
<artifactItem>
<groupId>org.eclipse.lsp4jakarta</groupId>
<artifactId>org.eclipse.lsp4jakarta.ls</artifactId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
<classifier>jar-with-dependencies</classifier>
</artifactItem>
</artifactItems>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.lsp4jakarta.lsp4e.feature"
label="org.eclipse.lsp4jakarta.lsp4e Feature"
version="0.1.1.qualifier">
version="0.1.2.qualifier">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
<groupId>org.eclipse.lsp4jakarta</groupId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e.feature</artifactId>
<packaging>eclipse-feature</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
<groupId>org.eclipse.lsp4jakarta</groupId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e.site</artifactId>
<packaging>eclipse-repository</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse LSP4Jakarta Plugin Test Fragment (Incubation)
Bundle-Vendor: Eclipse LSP4Jakarta
Bundle-SymbolicName: org.eclipse.lsp4jakarta.lsp4e.test
Bundle-Version: 0.1.1.qualifier
Fragment-Host: org.eclipse.lsp4jakarta.lsp4e.core;bundle-version="0.1.1"
Bundle-Version: 0.1.2.qualifier
Fragment-Host: org.eclipse.lsp4jakarta.lsp4e.core;bundle-version="0.1.2"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.jdt.junit4.runtime;bundle-version="1.1.0",
org.junit;bundle-version="4.11"
Expand Down
2 changes: 1 addition & 1 deletion jakarta.eclipse/org.eclipse.lsp4jakarta.lsp4e.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
<groupId>org.eclipse.lsp4jakarta</groupId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.lsp4jakarta.lsp4e.test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jakarta.eclipse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.lsp4jakarta</groupId>
<artifactId>org.eclipse.lsp4jakarta.lsp4e</artifactId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Eclipse LSP4Jakarta LSP4E Parent</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Eclipse LSP4Jakarta JDT Extension (Incubation)
Bundle-Vendor: Eclipse LSP4Jakarta
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.lsp4jakarta.jdt.core;singleton:=true
Bundle-Version: 0.1.1.qualifier
Bundle-Version: 0.1.2.qualifier
Bundle-Activator: org.eclipse.lsp4jakarta.jdt.core.JakartaCorePlugin
Require-Bundle:
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion jakarta.jdt/org.eclipse.lsp4jakarta.jdt.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.lsp4jakarta</groupId>
<artifactId>jdt-parent</artifactId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.jdt.core</artifactId>
<packaging>eclipse-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion jakarta.jdt/org.eclipse.lsp4jakarta.jdt.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.lsp4jakarta</groupId>
<artifactId>jdt-parent</artifactId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.jdt.site</artifactId>
<packaging>eclipse-repository</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Eclipse LSP4Jakarta JDT Test Plugin (Incubation)
Bundle-Vendor: Eclipse LSP4Jakarta
Bundle-SymbolicName: org.eclipse.lsp4jakarta.jdt.test
Bundle-Version: 0.1.1.qualifier
Bundle-Version: 0.1.2.qualifier
Automatic-Module-Name: org.eclipse.lsp4jakarta.jdt.test
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle:
Expand Down
2 changes: 1 addition & 1 deletion jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.lsp4jakarta</groupId>
<artifactId>jdt-parent</artifactId>
<version>0.1.1-SNAPSHOT</version>
<version>0.1.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lsp4jakarta.jdt.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>demo-servlet-no-diagnostics</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>io.openliberty</groupId>
<artifactId>demo-servlet-no-diagnostics</artifactId>
<version>0.0.1-SNAPSHOT</version>

<name>demo-servlet-no-diagnostics</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

<dependencies>
<!-- Provided dependencies -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>9.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>3.3</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
<!-- For tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>3.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>7.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>4.0.0</version>
</dependency>
<!-- Support for JDK 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<!-- Enable liberty-maven plugin -->
<!-- tag::libertyMavenPlugin[] -->
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>3.3.4</version>
<configuration>
<runtimeArtifact>
<groupId>io.openliberty.beta</groupId>
<artifactId>openliberty-jakartaee9</artifactId>
<version>21.0.0.2-beta</version>
<type>zip</type>
</runtimeArtifact>
</configuration>
</plugin>
<!-- end::libertyMavenPlugin[] -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package io.openliberty.sample.jakarta.annotations;

import jakarta.fake.Generated;

@Generated(value = "demoServlet", date="")
public class GeneratedAnnotation {

@Generated(value = "demoServlet", date="not_ISO_compliant")
private Integer studentId;

@Generated(value = "demoServlet", date="2001-07-04T12:08:56.235-0700")
private boolean isHappy;

@Generated(value = "demoServletijiojioj", date="NOTISOCOMPLIANT2")
private boolean isSad;

@Generated("com.sun.xml.rpc.AProcessor")
private String emailAddress;

@Generated(value="com.sun.xml.rpc.AProcessor")
private String homeTown;

public GeneratedAnnotation(Integer studentId, Boolean isHappy, boolean isSad, String graduationDate, Integer gpa,
String emailAddress) {
this.studentId = studentId;
this.isHappy = isHappy;
this.isSad = isSad;
this.emailAddress = emailAddress;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package io.openliberty.sample.jakarta.annotations;

import jakarta.fake.PostConstruct;
import jakarta.fake.Resource;

@Resource(type = Object.class, name = "aa")
public class PostConstructAnnotation {

private Integer studentId;

private boolean isHappy;

private boolean isSad;

@PostConstruct()
public Integer getStudentId() {
return this.studentId;
}

@PostConstruct
public void getHappiness(String type) {

}

@PostConstruct
public void throwTantrum() throws Exception {
System.out.println("I'm sad");
}

private String emailAddress;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package io.openliberty.sample.jakarta.annotations;

import jakarta.fake.PreDestroy;
import jakarta.fake.Resource;

@Resource(type = Object.class, name = "aa")
public class PreDestroyAnnotation {

private Integer studentId;

private boolean isHappy;

private boolean isSad;

@PreDestroy()
public Integer getStudentId() {
return this.studentId;
}

@PreDestroy()
public boolean getHappiness(String type) {
if (type.equals("happy")) return this.isHappy;
return this.isSad;
}

@PreDestroy()
public static void makeUnhappy() {
System.out.println("I'm sad");
}

@PreDestroy()
public void throwTantrum() throws Exception {
System.out.println("I'm sad");
}


private String emailAddress;


}



Loading

0 comments on commit f93571a

Please sign in to comment.