This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1deeffebc6ac97141bd67874eab67b49e18227db
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 14 14:19:00 2023 +0100
Code clean-up - no functional change
---
java/javax/ejb/EJB.java | 7 ++++++-
java/javax/mail/Session.java | 1 +
java/javax/mail/internet/MimeMessage.java | 2 ++
java/javax/persistence/PersistenceContext.java | 6 +++++-
java/javax/persistence/PersistenceProperty.java | 1 +
java/javax/persistence/PersistenceUnit.java | 3 ++-
java/javax/xml/ws/WebServiceRef.java | 6 +++++-
7 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index bf37ba8b14..46b0aa23f6 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -21,15 +21,20 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface EJB {
String name() default "";
+
String description() default "";
+
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
Class beanInterface() default java.lang.Object.class;
+
String beanName() default "";
+
String mappedName() default "";
+
String lookup() default "";
}
diff --git a/java/javax/mail/Session.java b/java/javax/mail/Session.java
index a95a11b574..b409fa4110 100644
--- a/java/javax/mail/Session.java
+++ b/java/javax/mail/Session.java
@@ -23,6 +23,7 @@ public class Session {
public static Session getInstance(Properties props, Authenticator auth) {
return null;
}
+
public static Session getInstance(Properties props) {
return null;
}
diff --git a/java/javax/mail/internet/MimeMessage.java
b/java/javax/mail/internet/MimeMessage.java
index 25877302af..4945ffd8af 100644
--- a/java/javax/mail/internet/MimeMessage.java
+++ b/java/javax/mail/internet/MimeMessage.java
@@ -23,9 +23,11 @@ public class MimeMessage implements MimePart {
public MimeMessage(Session session) {
// Dummy implementation
}
+
public void setFrom(InternetAddress from) {
// Dummy implementation
}
+
public void setSubject(String subject) {
// Dummy implementation
}
diff --git a/java/javax/persistence/PersistenceContext.java
b/java/javax/persistence/PersistenceContext.java
index 428fa09cff..eb65739aef 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/javax/persistence/PersistenceContext.java
@@ -21,13 +21,17 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContext {
String name() default "";
+
String unitName() default "";
+
PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
PersistenceProperty[] properties() default {};
+
SynchronizationType synchronization() default
SynchronizationType.SYNCHRONIZED;
}
diff --git a/java/javax/persistence/PersistenceProperty.java
b/java/javax/persistence/PersistenceProperty.java
index 6379071b11..5a8643482d 100644
--- a/java/javax/persistence/PersistenceProperty.java
+++ b/java/javax/persistence/PersistenceProperty.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
public @interface PersistenceProperty {
String name();
+
String value();
}
diff --git a/java/javax/persistence/PersistenceUnit.java
b/java/javax/persistence/PersistenceUnit.java
index 54f5150c4b..5024f4159e 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/javax/persistence/PersistenceUnit.java
@@ -21,10 +21,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnit {
String name() default "";
+
String unitName() default "";
}
diff --git a/java/javax/xml/ws/WebServiceRef.java
b/java/javax/xml/ws/WebServiceRef.java
index 8106123a99..5edcbe4324 100644
--- a/java/javax/xml/ws/WebServiceRef.java
+++ b/java/javax/xml/ws/WebServiceRef.java
@@ -21,15 +21,19 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
public @interface WebServiceRef {
String name() default "";
+
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
Class type() default java.lang.Object.class;
+
@SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to
match specification
Class value() default java.lang.Object.class;
+
String wsdlLocation() default "";
+
String mappedName() default "";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
