Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
22e397cd
Commit
22e397cd
authored
Mar 09, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
7f831670
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
26 deletions
+52
-26
EndpointAutoConfiguration.java
...boot/actuate/autoconfigure/EndpointAutoConfiguration.java
+7
-0
JolokiaAutoConfiguration.java
.../boot/actuate/autoconfigure/JolokiaAutoConfiguration.java
+1
-1
MetricRepositoryAutoConfiguration.java
...uate/autoconfigure/MetricRepositoryAutoConfiguration.java
+1
-1
ActiveMQProperties.java
...gframework/boot/autoconfigure/jms/ActiveMQProperties.java
+6
-5
JmsTemplateAutoConfiguration.java
.../boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java
+2
-19
JmsTemplateProperties.java
...amework/boot/autoconfigure/jms/JmsTemplateProperties.java
+34
-0
InMemoryMessageRespository.java
...i/src/main/java/sample/ui/InMemoryMessageRespository.java
+1
-0
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java
View file @
22e397cd
...
...
@@ -187,6 +187,7 @@ public class EndpointAutoConfiguration {
@Autowired
private
final
ConfigurableEnvironment
environment
=
new
StandardEnvironment
();
@Value
(
"${spring.git.properties:classpath:git.properties}"
)
private
Resource
gitProperties
;
...
...
@@ -213,7 +214,9 @@ public class EndpointAutoConfiguration {
}
public
static
class
GitInfo
{
private
String
branch
;
private
final
Commit
commit
=
new
Commit
();
public
String
getBranch
()
{
...
...
@@ -229,7 +232,9 @@ public class EndpointAutoConfiguration {
}
public
static
class
Commit
{
private
String
id
;
private
String
time
;
public
String
getId
()
{
...
...
@@ -248,7 +253,9 @@ public class EndpointAutoConfiguration {
public
void
setTime
(
String
time
)
{
this
.
time
=
time
;
}
}
}
}
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java
View file @
22e397cd
...
...
@@ -44,7 +44,7 @@ import org.springframework.context.annotation.Configuration;
*
* <p>
* Additional configuration parameters for Jolokia can be provided by specifying
* <code>jolokia.config.
...
</code> properties. See the <a
* <code>jolokia.config.
*
</code> properties. See the <a
* href="http://jolokia.org">http://jolokia.org</a> web site for more information on
* supported configuration parameters.
*
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
View file @
22e397cd
...
...
@@ -75,7 +75,7 @@ import com.codahale.metrics.MetricRegistry;
* By default all metric updates go to all {@link MetricWriter} instances in the
* application context. To change this behaviour define your own metric writer bean called
* "primaryMetricWriter", mark it <code>@Primary</code>, and this one will receive all
* updates from the default counter and gauge services. A
L
ternatively you can provide your
* updates from the default counter and gauge services. A
l
ternatively you can provide your
* own counter and gauge services and wire them to whichever writer you choose.
* </p>
*
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/ActiveMQProperties.java
View file @
22e397cd
...
...
@@ -20,27 +20,28 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* Configuration properties for ActiveMQ
*
* @author Greg Turnquist
*/
@ConfigurationProperties
(
name
=
"spring.activemq"
)
public
class
ActiveMQProperties
{
private
String
brokerU
RL
=
"tcp://localhost:61616"
;
private
String
brokerU
rl
=
"tcp://localhost:61616"
;
private
boolean
inMemory
=
true
;
private
boolean
pooled
=
false
;
// Will override brokerURL if inMemory is set to true
public
String
getBrokerU
RL
()
{
public
String
getBrokerU
rl
()
{
if
(
this
.
inMemory
)
{
return
"vm://localhost"
;
}
return
this
.
brokerU
RL
;
return
this
.
brokerU
rl
;
}
public
void
setBrokerU
RL
(
String
brokerURL
)
{
this
.
brokerU
RL
=
brokerURL
;
public
void
setBrokerU
rl
(
String
brokerUrl
)
{
this
.
brokerU
rl
=
brokerUrl
;
}
public
boolean
isInMemory
()
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java
View file @
22e397cd
...
...
@@ -24,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.jms.JmsTemplateAutoConfiguration.JmsTemplateProperties
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -55,21 +53,6 @@ public class JmsTemplateAutoConfiguration {
return
jmsTemplate
;
}
@ConfigurationProperties
(
name
=
"spring.jms"
)
public
static
class
JmsTemplateProperties
{
private
boolean
pubSubDomain
=
true
;
public
boolean
isPubSubDomain
()
{
return
this
.
pubSubDomain
;
}
public
void
setPubSubDomain
(
boolean
pubSubDomain
)
{
this
.
pubSubDomain
=
pubSubDomain
;
}
}
@Configuration
@ConditionalOnClass
(
ActiveMQConnectionFactory
.
class
)
@ConditionalOnMissingBean
(
ConnectionFactory
.
class
)
...
...
@@ -84,10 +67,10 @@ public class JmsTemplateAutoConfiguration {
if
(
this
.
config
.
isPooled
())
{
PooledConnectionFactory
pool
=
new
PooledConnectionFactory
();
pool
.
setConnectionFactory
(
new
ActiveMQConnectionFactory
(
this
.
config
.
getBrokerU
RL
()));
.
getBrokerU
rl
()));
return
pool
;
}
return
new
ActiveMQConnectionFactory
(
this
.
config
.
getBrokerU
RL
());
return
new
ActiveMQConnectionFactory
(
this
.
config
.
getBrokerU
rl
());
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateProperties.java
0 → 100644
View file @
22e397cd
/*
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
autoconfigure
.
jms
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
@ConfigurationProperties
(
name
=
"spring.jms"
)
public
class
JmsTemplateProperties
{
private
boolean
pubSubDomain
=
true
;
public
boolean
isPubSubDomain
()
{
return
this
.
pubSubDomain
;
}
public
void
setPubSubDomain
(
boolean
pubSubDomain
)
{
this
.
pubSubDomain
=
pubSubDomain
;
}
}
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/ui/InMemoryMessageRespository.java
View file @
22e397cd
...
...
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
public
class
InMemoryMessageRespository
implements
MessageRepository
{
private
static
AtomicLong
counter
=
new
AtomicLong
();
private
final
ConcurrentMap
<
Long
,
Message
>
messages
=
new
ConcurrentHashMap
<
Long
,
Message
>();
@Override
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment